Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
518 Commits 1 Branch 0 Tags
Commit Graph

92 Commits

Author SHA1 Message Date
Felix Geyer
3d1c4afc8e Drop patches (fixed upstream): 
* Drop patches (fixed upstream):
  - fix-bootstrap-test-1.diff
  - fix-bootstrap-test-2.diff
 2014-08-08 17:54:41 +02:00
Felix Geyer
81f9ce9764 Merge branch 'master' into experimental 
Conflicts:
	debian/patches/series
 2014-08-05 20:21:03 +02:00
Felix Geyer
1769e4ab61 Drop multiarch_findgtk2_fix.diff, was already fixed upstream in 2.8.11. 2014-08-05 20:18:25 +02:00
Felix Geyer
2a3514be35 Fix running the test suite. 
* Fix running the test suite.
  - Cherry-pick upstream fix in fix-bootstrap-test-1.diff and
    fix-bootstrap-test-2.diff
 2014-08-03 22:32:34 +02:00
Felix Geyer
c8df114fc5 Patch refresh. 2014-08-03 20:41:03 +02:00
Felix Geyer
19811e3d1d Fix JNI detection on ppc64el. 
* Fix JNI detection on ppc64el.
  - Add FindJNI_ppc64le.diff, cherry-picked from upstream.
 2014-08-03 10:44:40 +02:00
Gilles Filippini
4de62b31d9 Imported Debian patch 2.8.12.1-1.6 2014-08-03 09:56:27 +02:00
Felix Geyer
b353df6d1c Imported Debian patch 2.8.12.1-1.5 2014-08-03 09:56:24 +02:00
Anibal Monsalve Salazar
68a9b85cc3 Imported Debian patch 2.8.12.1-1.4 2014-08-03 09:56:22 +02:00
Anibal Monsalve Salazar
5f578c6c76 Imported Debian patch 2.8.12.1-1.3 2014-08-03 09:55:41 +02:00
Bas Couwenberg
7f2eb9ad34 Backport patch to support Ruby 2.0 and 2.1 in FindRuby.cmake. 2014-02-28 15:54:27 +01:00
Bas Couwenberg
ee6e1488d0 Merge changes from 2.8.12.1-1.1 Non-maintainer upload. 2014-02-28 15:54:26 +01:00
Modestas Vainius
b041fb2d6b Drop fixup_manpages.diff patch: merged upstream. 2013-11-07 00:55:53 +02:00
Modestas Vainius
d01605906a Fix FTBFS on kFreeBSD (fix-ftbfs-on-kfreebsd.patch). 2013-11-04 00:31:25 +02:00
Modestas Vainius
de7cc524f3 Fix spelling mistakes in manpages. 
Patch: fixup_manpages.diff
 2013-11-03 20:42:42 +02:00
Modestas Vainius
d872a16def Properly find Java when kernel is 64bit, userland - 32bit (amd64/ppc64). 
Patch: FindJNI_amd64_ppc_biarch.diff
(Closes: #718290)
 2013-11-03 19:57:47 +02:00
Modestas Vainius
4a008406a5 Fix a code typo in PHP4 (patch FindPHP4_fix_typo.diff). 
Thanks to Mathieu Malaterre for the patch.
Closes: #722475
 2013-11-03 17:52:48 +02:00
Modestas Vainius
caa317beae Drop fix-regexp-chars-in-the-build-path patch. 
It was merged upstream.
 2013-06-16 00:57:52 +03:00
Modestas Vainius
43d1f32370 Make tests pass when cmake build path contains regex metacharacters. 
This is important for BPO builds on the buildds.

Backported (from future 2.8.12) and adapted patches:
  - 0001-Fix-test-failures-caused-by-regexp-sensitive-charact.patch
  - tests-fix-Memcheck-tests-in-a-dir-with-regex-special.patch
 2013-06-02 22:09:05 +03:00
Modestas Vainius
c5b5a65178 FindQt4: define QT_IMPORTS_DIR variable even if it is not present on the system. 
This happens when there are no plugins currently installed.

Patch qt_import_dir_variable.diff. Stolen from Ubuntu.
 2013-05-19 12:38:07 +03:00
Modestas Vainius
d73e641691 Support multi-arch capable python. 
(patch multiarch-python-include-dirs.diff)
 2013-05-19 12:38:07 +03:00
Modestas Vainius
816c0623f3 Drop FindPostgreSQL_665721.diff patch, merged upstream. 2013-03-16 20:40:54 +02:00
Modestas Vainius
8f01d6797f Install to multiarch libdir on kFreeBSD and Hurd like on Linux. 
Thanks to John Stamp
Patch: install_to_multiarch_libdir_on_kfreebsd_hurd.diff
(Closes: #684956)
 2012-08-18 22:52:50 +03:00
Modestas Vainius
e0c125be38 Make FindPostgreSQL find headers on Debian. 
Thanks to Pere Nubiola i Radigales and Gregor Jasny.
Patch: FindPostgreSQL_665721.diff
(Closes: #665721)
 2012-08-18 22:52:22 +03:00
Modestas Vainius
ca14e008bc Remove patches, merged upstream. 
- backport_findpkgconfig_set_found_variable.diff;
- backport_module_no_soname.diff;
- manpage_fixes.diff.
 2012-06-27 20:56:49 +03:00
Modestas Vainius
ed90284d35 Backport a no-soname feature from CMake (2.8.9) master tree. 
Just set a NO_SONAME property on the shared library or module target in order
to skip addition of the SONAME field to the shared object. This makes it
possible to build Debian Python policy compliant modules with CMake. (Closes:
#668982)

Patch: backport_module_no_soname.diff
 2012-05-02 21:49:57 +03:00
Modestas Vainius
c3b31313bb FindPkgConfig.cmake: properly set documented PKG_CONFIG_FOUND variable. 
The patch backport_findpkgconfig_set_found_variable.diff was backported from
upstream 3ea850a.

(Closes: #669627)
 2012-04-29 09:55:33 +03:00
Modestas Vainius
71d036b662 Readd manpage_fixes.diff patch with new man page fixes. 2012-04-19 22:31:59 +03:00
Modestas Vainius
04c0477c56 Remove patches merged/backported from upstream. 
- backport_findpython_fixes.diff
- backport_findruby_improvements.diff
- backport_support_cxxtest4.diff
- manpage_fixes.diff
- mipsel_is_little_endian.diff
- paths_in_regex_espace_metachars.diff
 2012-04-19 19:08:28 +03:00
Modestas Vainius
36c3f31c63 Add support for CxxTest 4 in FindCxxTest. 
Backport a patch backport_support_cxxtest4.diff from cmake master.
(Closes: #662982)
 2012-03-17 00:40:44 +02:00
Modestas Vainius
93e74a456e Backport a bunch of FindRuby improvements from cmake master. 
It should be able to properly find ruby 1.9.1 as packaged in Debian now.
(Closes: #643949)

(patch backport_findruby_improvements.diff)
 2012-03-17 00:40:43 +02:00
Modestas Vainius
f0b0b0d2f4 Backport a bunch of FindPython* related commits from cmake master. 
It is now possible to force a specific python version via command line again.
The interface has changed though, see NEWS entry. (Closes: #663188)

(patch backport_findpython_fixes.diff)
 2012-03-17 00:40:43 +02:00
Modestas Vainius
74bc2b76d2 Drop support_cppflags.diff patch. 
This particular solution was rejected by upstream.
Reopens #653916.
 2012-02-27 01:07:42 +02:00
Modestas Vainius
8c098f5507 Fix some tests not to fail if absolute build path contains regex metacharacters like +. 
This makes the package binNMUable again. (patch
paths_in_regex_espace_metachars.diff)
 2012-02-27 01:07:42 +02:00
Modestas Vainius
4f2ae6f526 Properly detect mipsel as little endian architecture. 
Fixes FTBFS (patch mipsel_is_little_endian.diff).
 2012-02-19 13:40:30 +02:00
Modestas Vainius
11cd193c55 Fix various typos and formatting errors in manpages 
Patch manpage_fixes.diff.
 2012-02-18 15:43:23 +02:00
Modestas Vainius
6a10d7b694 Respect CPPFLAGS environment variable. 
Append it to C(XX)FLAGS when building C/C++ sources.
Patch support_cppflags.diff.
(Closes: #653916)
 2012-02-18 13:49:53 +02:00
Modestas Vainius
b896b4e6b7 Remove multiarch_lib_dirs_should_be_implicit.diff patch, merged upstream. 2012-02-18 13:25:57 +02:00
Modestas Vainius
97296f5ce6 Make sure CMake considers /lib/<arch> as implicit. 
Therefore CMake keeps it out of automatic R(UN)PATH then (patch
multiarch_lib_dirs_should_be_implicit.diff).
 2011-07-09 15:17:25 +03:00
Modestas Vainius
3dabc0c10b Drop merged patches. 
* Drop screen-256color-bce.diff - merged upstream.
* Drop spelling_formatting_fixes.diff - merged upstream.
 2011-07-09 00:52:10 +03:00
Modestas Vainius
49ef65c97c Fix a couple of new spelling / formatting errors. 
(patch spelling_formatting_fixes.diff)

W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakemodules.1.gz 2641: warning [p 39, 1.5i]: can't break line
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakeprops.1.gz explict explicit
I: cmake: spelling-error-in-binary usr/bin/cmake explict explicit
I: cmake: spelling-error-in-binary usr/bin/cpack explict explicit
I: cmake: spelling-error-in-binary usr/bin/ctest explict explicit
W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 7300: warning [p 120, 3.3i]: can't break line
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz explict explicit
I: cmake-curses-gui: spelling-error-in-binary usr/bin/ccmake explict explicit
I: cmake-qt-gui: spelling-error-in-binary usr/bin/cmake-gui explict explicit
 2011-06-19 17:35:09 +03:00
Modestas Vainius
05b13d548a Drop patches which are no longer needed. 
* Drop fixup_manpages.diff patch, merged upstream.
* Drop backport_test_order_fix.diff patch, was backported from upstream.
* Drop multiarch_basic_support.diff patch, merged upstream.
 2011-06-19 15:51:30 +03:00
Modestas Vainius
392f6fb9bc Add multiarch implementation from upstream. 
Implemented in patch multiarch_basic_support.diff, taken from upstream bug
backwards compatible with previous releases and in addition, it implements
multiarch support for find_package().
 2011-06-09 01:12:42 +03:00
Modestas Vainius
db159fb2cc Revert "Fix find_library() to find libraries in multiarch library paths." 
This effectively reverts commit 3220ba5539ea5095540d8bbf297ee568ce3e8b40 and
adds appropriate debian/changelog modifications.
 2011-06-09 00:40:55 +03:00
Modestas Vainius
d387f1b70e Make FindGTK2.cmake work with Debian multiarch. 
Implemented in the patch multiarch_findgtk2_fix.diff.
(LP: #751940)
 2011-06-08 00:11:29 +03:00
Modestas Vainius
3220ba5539 Fix find_library() to find libraries in multiarch library paths. 
While the patch is not a good fix (hackish by nature, no cross-compilation
support etc.), it should do the job in majority of cases. Also require dpkg-dev
>= 1.16 at both build time (Build-Depends) and runtime (cmake Depends) because
the patch needs dpkg-architecture -qDEB_HOST_MULTIARCH. (Closes: #618932)

Implemented in multiarch_library_directory_hack.diff.
 2011-06-08 00:08:18 +03:00
Modestas Vainius
f28541d7ef Generate colour Makefiles if $TERM is 'screen-256color-bce'. 
Thanks to Davide Mancusi for the patch (screen-256color-bce.diff).
(Closes: #627853)
 2011-05-30 23:44:34 +03:00
Modestas Vainius
7b26c06e09 Backport patch to fix test order (broken in 2.8.4). 
Add backport_test_order_fix.diff to restore conpatibility with earlier versions
with respect to the test run order. (Closes: #615054)
 2011-02-25 19:12:17 +02:00
Kai Wasserbäch
cdd8ec7b95 debian/patches/FindBoost_add_-lpthread_#563479.diff: Added. (Closes: #563479) 2011-01-16 18:33:22 +01:00
Kai Wasserbäch
c17a90bf49 Dropped obsolete patch: FindPython_fix_#569321_and_#580503.diff 2011-01-16 11:49:34 +01:00