From ece6bb12827a96e06442061d2c324deb23e1f38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 25 Sep 2013 20:41:15 +0200 Subject: [PATCH] Enable WITH_XRANDR and WITH_XCOMPOSITE on Debian and Ubuntu (cherry picked from commit 17ad11ff99cf97c9bb9a61b55f6991bffab3e3fe) --- debian/lenny/kdelibs/debian/rules | 28 +++++++++++++++++++++++++--- debian/squeeze/kdelibs/debian/rules | 28 +++++++++++++++++++++++++--- ubuntu/maverick/kdelibs/debian/rules | 28 +++++++++++++++++++++++++--- 3 files changed, 75 insertions(+), 9 deletions(-) diff --git a/debian/lenny/kdelibs/debian/rules b/debian/lenny/kdelibs/debian/rules index 8c3eb8b22..1720653b1 100755 --- a/debian/lenny/kdelibs/debian/rules +++ b/debian/lenny/kdelibs/debian/rules @@ -20,9 +20,31 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_LIBBFD="ON" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_LZMA="ON" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_CMAKE_EXTRA_FLAGS := \ + -DLIB_SUFFIX="" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ + -DCMAKE_INCLUDE_PATH="/opt/trinity/include" \ + -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_LIBBFD="ON" \ + -DWITH_LIBART="ON" \ + -DWITH_LIBIDN="ON" \ + -DWITH_TIFF="ON" \ + -DWITH_JASPER="ON" \ + -DWITH_OPENEXR="ON" \ + -DWITH_AVAHI="ON" \ + -DWITH_ASPELL="ON" \ + -DWITH_HSPELL="ON" \ + -DWITH_LZMA="ON" \ + -DWITH_XRANDR="ON" \ + -DWITH_XCOMPOSITE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/debian/squeeze/kdelibs/debian/rules b/debian/squeeze/kdelibs/debian/rules index 94e5fda8b..5ecb859a1 100755 --- a/debian/squeeze/kdelibs/debian/rules +++ b/debian/squeeze/kdelibs/debian/rules @@ -20,9 +20,31 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_LIBBFD="ON" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_LZMA="ON" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_CMAKE_EXTRA_FLAGS := \ + -DLIB_SUFFIX="" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ + -DCMAKE_INCLUDE_PATH="/opt/trinity/include" \ + -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_LIBBFD="ON" \ + -DWITH_LIBART="ON" \ + -DWITH_LIBIDN="ON" \ + -DWITH_TIFF="ON" \ + -DWITH_JASPER="ON" \ + -DWITH_OPENEXR="ON" \ + -DWITH_AVAHI="ON" \ + -DWITH_ASPELL="ON" \ + -DWITH_HSPELL="ON" \ + -DWITH_LZMA="ON" \ + -DWITH_XRANDR="ON" \ + -DWITH_XCOMPOSITE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/ubuntu/maverick/kdelibs/debian/rules b/ubuntu/maverick/kdelibs/debian/rules index 60afce49d..af8feccb3 100755 --- a/ubuntu/maverick/kdelibs/debian/rules +++ b/ubuntu/maverick/kdelibs/debian/rules @@ -20,9 +20,31 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_LIBBFD="ON" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_LZMA="ON" \ --DCMAKE_BUILD_TYPE=RelWithDebInfo +DEB_CMAKE_EXTRA_FLAGS := \ + -DLIB_SUFFIX="" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ + -DCMAKE_INCLUDE_PATH="/opt/trinity/include" \ + -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_LIBBFD="ON" \ + -DWITH_LIBART="ON" \ + -DWITH_LIBIDN="ON" \ + -DWITH_TIFF="ON" \ + -DWITH_JASPER="ON" \ + -DWITH_OPENEXR="ON" \ + -DWITH_AVAHI="ON" \ + -DWITH_ASPELL="ON" \ + -DWITH_HSPELL="ON" \ + -DWITH_LZMA="ON" \ + -DWITH_XRANDR="ON" \ + -DWITH_XCOMPOSITE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS.