diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2013-07-05 22:43:43 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2013-07-05 22:43:43 -0300 |
| commit | 5bc5e6e3ff9ce7a4d669f6bf0d732ca37d5b220f (patch) | |
| tree | c5b5811ad4e5302e962073a2fc06231c40686798 | |
| parent | a791632a928ac9d835668d25a66250d2a4007262 (diff) | |
| download | qtbase-5bc5e6e3ff9ce7a4d669f6bf0d732ca37d5b220f.tar.gz | |
Remove build_examples.patch
An add the new -compile-examples switch.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/build_examples.patch | 23 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 1 |
4 files changed, 2 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog index cd07cc2..f58b98e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ qtbase-opensource-src (5.1.0+dfsg-1) UNRELEASED; urgency=low * Remove patches applied upstream: - undef_B0.diff - Rename-qAbs-Function-for-timeval.patch + - build_examples.patch, adding the new -compile-examples switch. * Refresh patches: deppath_gnu.diff. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 27 Jun 2013 14:04:21 -0300 diff --git a/debian/patches/build_examples.patch b/debian/patches/build_examples.patch deleted file mode 100644 index 00e0072..0000000 --- a/debian/patches/build_examples.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: re enable building the examples by default. - Commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61 made the examples - not being made by default. The only way to get them is to - enable -developer-build, which we do not want. So we simply - patch out this commit. -Author: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> -Forwarded: https://bugreports.qt-project.org/browse/QTBUG-30788 - ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PW - allfiles -= doc - !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") - } -- -- # Do not actually build the examples in production builds with -prefix -- !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) { -- TEMPLATE = aux -- CONFIG -= have_target qt staticlib dll -- SOURCES = -- INSTALLS -= target -- } - } diff --git a/debian/patches/series b/debian/patches/series index 2e95405..dff76ac 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ deppath_gnu.diff # Debian specific. -build_examples.patch diff --git a/debian/rules b/debian/rules index 2ed513d..eaca5e8 100755 --- a/debian/rules +++ b/debian/rules @@ -129,6 +129,7 @@ override_dh_auto_configure: -glib \ -icu \ -accessibility \ + -compile-examples \ --no-directfb \ $(extra_configure_opts) |