summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-31 01:57:49 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-31 01:57:49 -0500
commit87402a68a2871ea46422eef2ee03dd9500ca0ca4 (patch)
tree5603d775e32bd791e224dbd131a4a474756308a9
parentfd1d43a359914bca16591f17f5c63c4689164b13 (diff)
downloadtde-packaging-87402a68a2871ea46422eef2ee03dd9500ca0ca4.tar.gz
tde-packaging-87402a68a2871ea46422eef2ee03dd9500ca0ca4.zip
Fix up kdegraphics cmake build for Maverick
-rw-r--r--ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk17
-rw-r--r--ubuntu/maverick/kdegraphics.cmake/debian/cdbs/kde.mk8
-rw-r--r--ubuntu/maverick/kdegraphics.cmake/debian/control24
-rw-r--r--ubuntu/maverick/kdegraphics.cmake/debian/libpoppler-tqt-dev.install3
-rw-r--r--ubuntu/maverick/kdegraphics.cmake/debian/libpoppler-tqt.install3
-rw-r--r--ubuntu/maverick/kdegraphics.cmake/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--ubuntu/maverick/kdegraphics.cmake/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--ubuntu/maverick/kdegraphics.cmake/debian/patches/common/kubuntu_01_kdepot.diff26
-rwxr-xr-xubuntu/maverick/kdegraphics.cmake/debian/rules1
9 files changed, 102 insertions, 9 deletions
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk
index 888f4be38..a5e510758 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,9 @@ _cdbs_class_debian-qt-kde := 1
# Note: This _must_ be included before autotools.mk, or it won't work.
common-configure-arch common-configure-indep:: debian/stamp-cvs-make
debian/stamp-cvs-make:
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
touch debian/stamp-cvs-make
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -21,7 +24,7 @@ DEB_KDE_ENABLE_FINAL := yes
DEB_INSTALL_DOCS_ALL :=
DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+DEB_SHLIBDEPS_INCLUDE = /usr/lib/mesa $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/opt/trinity/lib)
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
@@ -72,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
if test -e debian/$(cdbs_curpkg).lintian; then \
install -p -D -m644 debian/$(cdbs_curpkg).lintian \
- debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \
fi
if test -e debian/$(cdbs_curpkg).presubj; then \
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
- debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \
fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
@@ -93,6 +96,14 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
done
clean::
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
rm -f debian/stamp-cvs-make
endif
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/kde.mk
index 9dbcfbafd..5b6508f8c 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/kdegraphics.cmake/debian/cdbs/kde.mk
@@ -35,7 +35,7 @@ else
DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
endif
-# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
export kde_cgidir = \$${libdir}/cgi-bin
export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
@@ -70,7 +70,7 @@ cleanbuilddir::
common-build-arch common-build-indep:: debian/stamp-kde-apidox
debian/stamp-kde-apidox:
-# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
touch $@
common-install-prehook-impl::
@@ -82,7 +82,7 @@ common-install-prehook-impl::
common-install-arch common-install-indep:: common-install-kde-apidox
common-install-kde-apidox::
-# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
clean::
rm -f debian/stamp-kde-apidox
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/control b/ubuntu/maverick/kdegraphics.cmake/debian/control
index 8e302c251..cbae876fa 100644
--- a/ubuntu/maverick/kdegraphics.cmake/debian/control
+++ b/ubuntu/maverick/kdegraphics.cmake/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
+Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-trinity-dev (>= 4:3.5.10), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], cmake, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: kdegraphics-trinity
@@ -351,6 +351,28 @@ Description: scanner library for KDE3
This package is part of KDE3, as a component of the KDE graphics module.
See the 'kde-trinity' and 'kdegraphics-trinity' packages for more information.
+Package: libpoppler-tqt
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: TQt support for Poppler
+ TQt support library for Poppler.
+ This library is used by the Trinity graphics file plugins for PDF support.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+
+Package: libpoppler-tqt-dev
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, libpoppler-dev, libpoppler-tqt
+Description: Development files for TQt support for Poppler
+ Development files of TQt support library for Poppler.
+ This package contains the development files needed to compile applications against poppler-tqt.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde-trinity' and 'kdenetwork-trinity' packages for more information.
+
Package: kdegraphics-trinity-dbg
Section: libdevel
Architecture: any
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/libpoppler-tqt-dev.install b/ubuntu/maverick/kdegraphics.cmake/debian/libpoppler-tqt-dev.install
new file mode 100644
index 000000000..57d9ec1d0
--- /dev/null
+++ b/ubuntu/maverick/kdegraphics.cmake/debian/libpoppler-tqt-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/include/kde/poppler-link-qt3.h
+debian/tmp/opt/trinity/include/kde/poppler-page-transition.h
+debian/tmp/opt/trinity/include/kde/poppler-qt.h
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/libpoppler-tqt.install b/ubuntu/maverick/kdegraphics.cmake/debian/libpoppler-tqt.install
new file mode 100644
index 000000000..d63075962
--- /dev/null
+++ b/ubuntu/maverick/kdegraphics.cmake/debian/libpoppler-tqt.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/lib/libpoppler-tqt.so
+debian/tmp/opt/trinity/lib/libpoppler-tqt.so.0
+debian/tmp/opt/trinity/lib/libpoppler-tqt.so.0.0.0
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/04_am_maintainer_mode.diff
new file mode 100644
index 000000000..391a80285
--- /dev/null
+++ b/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/04_am_maintainer_mode.diff
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+
+ dnl generate the config header
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/06_disable_no_undefined.diff
new file mode 100644
index 000000000..05c932c3c
--- /dev/null
+++ b/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/06_disable_no_undefined.diff
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+ KDE_USE_CLOSURE_TRUE="#"
+ KDE_USE_CLOSURE_FALSE=""
+ KDE_NO_UNDEFINED=""
+- case $host in
+- *-*-linux-gnu)
+- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+- [KDE_NO_UNDEFINED=""])],
+- [KDE_NO_UNDEFINED=""])
+- ;;
+- esac
+ fi
+ AC_SUBST(KDE_USE_CLOSURE_TRUE)
+ AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/kubuntu_01_kdepot.diff
new file mode 100644
index 000000000..0caf5361a
--- /dev/null
+++ b/ubuntu/maverick/kdegraphics.cmake/debian/patches/common/kubuntu_01_kdepot.diff
@@ -0,0 +1,26 @@
+--- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
++++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+
++kdepotpath=/opt/trinity/include/kde/kde.pot
++
+ for subdir in $dirs; do
+ test -z "$VERBOSE" || echo "Making messages in $subdir"
+ (cd $subdir
+@@ -554,10 +556,10 @@
+ fi
+ perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+
+- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+- if ! test -f $kdepotpath; then
+- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+- fi
++# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++# if ! test -f $kdepotpath; then
++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++# fi
+
+ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/ubuntu/maverick/kdegraphics.cmake/debian/rules b/ubuntu/maverick/kdegraphics.cmake/debian/rules
index 093ef755f..653c978ae 100755
--- a/ubuntu/maverick/kdegraphics.cmake/debian/rules
+++ b/ubuntu/maverick/kdegraphics.cmake/debian/rules
@@ -13,7 +13,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-include debian/cdbs/debian-qt-kde.mk
DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -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_TIFF="ON" -DWITH_OPENEXR="ON" -DWITH_PDF="ON"