From 62d9e5b6085bc57bd47a4e8645e5e723067c9e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 11 Oct 2019 14:47:36 +0200 Subject: DEB libcarddav: Switch to cmake. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../dependencies/libcarddav/debian/README.Debian | 45 ----- .../dependencies/libcarddav/debian/README.fallback | 23 --- .../libcarddav/debian/cdbs/debian-tde.mk | 218 +++++++++++++++++++++ .../libcarddav/debian/cdbs/versions.pl | 19 ++ .../_base/dependencies/libcarddav/debian/control | 2 +- .../libcarddav/debian/libcarddav-dev.install | 4 + .../libcarddav/debian/libcarddav.install | 1 + debian/_base/dependencies/libcarddav/debian/rules | 115 +---------- debian/_base/dependencies/libcarddav/debian/watch | 2 - .../dependencies/libcarddav/debian/README.Debian | 45 ----- .../dependencies/libcarddav/debian/README.fallback | 23 --- .../libcarddav/debian/cdbs/debian-tde.mk | 218 +++++++++++++++++++++ .../libcarddav/debian/cdbs/versions.pl | 19 ++ .../_base/dependencies/libcarddav/debian/control | 2 +- .../libcarddav/debian/libcarddav-dev.install | 4 + .../libcarddav/debian/libcarddav.install | 1 + ubuntu/_base/dependencies/libcarddav/debian/rules | 115 +---------- ubuntu/_base/dependencies/libcarddav/debian/watch | 2 - 18 files changed, 506 insertions(+), 352 deletions(-) delete mode 100644 debian/_base/dependencies/libcarddav/debian/README.Debian delete mode 100644 debian/_base/dependencies/libcarddav/debian/README.fallback create mode 100644 debian/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk create mode 100644 debian/_base/dependencies/libcarddav/debian/cdbs/versions.pl create mode 100644 debian/_base/dependencies/libcarddav/debian/libcarddav-dev.install create mode 100644 debian/_base/dependencies/libcarddav/debian/libcarddav.install delete mode 100644 debian/_base/dependencies/libcarddav/debian/watch delete mode 100644 ubuntu/_base/dependencies/libcarddav/debian/README.Debian delete mode 100644 ubuntu/_base/dependencies/libcarddav/debian/README.fallback create mode 100644 ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk create mode 100644 ubuntu/_base/dependencies/libcarddav/debian/cdbs/versions.pl create mode 100644 ubuntu/_base/dependencies/libcarddav/debian/libcarddav-dev.install create mode 100644 ubuntu/_base/dependencies/libcarddav/debian/libcarddav.install delete mode 100644 ubuntu/_base/dependencies/libcarddav/debian/watch diff --git a/debian/_base/dependencies/libcarddav/debian/README.Debian b/debian/_base/dependencies/libcarddav/debian/README.Debian deleted file mode 100644 index 9adebeacc..000000000 --- a/debian/_base/dependencies/libcarddav/debian/README.Debian +++ /dev/null @@ -1,45 +0,0 @@ - Imlib Version 11 - ---------------- - -Imlib11 is linked with libpng12, which began life as libpng3. This is -in accordance with the practice of Redhat. The GDK version of imlib, -being part of GNOME 1, has remained linked with libpng2. - -No library that links with this version of Imlib may also link with -libpng2. - -No application that links with this version of Imlib may link with -libpng2, neither directly nor through a third library. - -If you accidentally link an application with imlib and libpng2, the -application may behave in unpredictible ways, possibly crashing, -possibly emitting warnings similar to the following: - - libpng warning: Application was compiled with png.h from libpng-1.2.1 - libpng warning: Application is running with png.c from libpng-1.0.12 - libpng error: Incompatible libpng version in application and library - - - - Imlib Version 1 - --------------- - -Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to -build with libpng2, install the package imlib1-dev or gdk-imlib1-dev -as appropriate. - - - The Palette File - ---------------- - -The system Imlib/Gdk-Imlib palette file was moved from the directory -`/etc/im' to `/etc/imlib'. This move may cause problems for users who -have a `.imrc' file in their home directory since that file may -contain a reference to the old location of the palette file. To -correct this problem, the "PaletteFile" entry should look like: - - PaletteFile /etc/imlib/im_palette.pal - -I believe this changed happened in late 1999. - - -- Steve M. Robbins , Sun Oct 19 15:11:42 2003 diff --git a/debian/_base/dependencies/libcarddav/debian/README.fallback b/debian/_base/dependencies/libcarddav/debian/README.fallback deleted file mode 100644 index 1b41c225f..000000000 --- a/debian/_base/dependencies/libcarddav/debian/README.fallback +++ /dev/null @@ -1,23 +0,0 @@ - Imlib Image Conversion - ---------------------- - -The imlib and gdk-imlib libraries have a number of built-in image -conversion routines, and are capable of loading or saving in *at -least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and -PPM. - -Prior to version 1.9.13, imlib and gdk-imlib could use an external -program, such as Imagemagick's "convert", to load or save images -in formats not handled internally to Imlib. - - - - "All fallbacks failed." - ----------------------- - -This message indicates that the file you wished to load is not handled -by Imlib. - -The remedy is to convert the image file by hand using, for example, -Imagemagick's "convert" command: "convert foo.rgb foo.png". Then -you'll have to fix up the application to use the new filename instead. diff --git a/debian/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..7a55130b2 --- /dev/null +++ b/debian/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk @@ -0,0 +1,218 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# 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: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +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_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + 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); \ + 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; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + 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 +endif + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/debian/_base/dependencies/libcarddav/debian/cdbs/versions.pl b/debian/_base/dependencies/libcarddav/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/debian/_base/dependencies/libcarddav/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/debian/_base/dependencies/libcarddav/debian/control b/debian/_base/dependencies/libcarddav/debian/control index c2409ffd1..961e1f94d 100644 --- a/debian/_base/dependencies/libcarddav/debian/control +++ b/debian/_base/dependencies/libcarddav/debian/control @@ -1,8 +1,8 @@ Source: libcarddav -Build-Depends: cdbs, debhelper (>= 7.0.50~), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev Section: graphics Priority: optional Maintainer: Timothy Pearson +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, libcurl4-gnutls-dev, libglib2.0-dev Standards-Version: 3.8.4 Package: libcarddav diff --git a/debian/_base/dependencies/libcarddav/debian/libcarddav-dev.install b/debian/_base/dependencies/libcarddav/debian/libcarddav-dev.install new file mode 100644 index 000000000..ce7045855 --- /dev/null +++ b/debian/_base/dependencies/libcarddav/debian/libcarddav-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/libcarddav/* +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcarddav.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcarddav.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/* diff --git a/debian/_base/dependencies/libcarddav/debian/libcarddav.install b/debian/_base/dependencies/libcarddav/debian/libcarddav.install new file mode 100644 index 000000000..2fa7b4f2e --- /dev/null +++ b/debian/_base/dependencies/libcarddav/debian/libcarddav.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcarddav.so.* diff --git a/debian/_base/dependencies/libcarddav/debian/rules b/debian/_base/dependencies/libcarddav/debian/rules index 38c17ea44..56e8f5415 100755 --- a/debian/_base/dependencies/libcarddav/debian/rules +++ b/debian/_base/dependencies/libcarddav/debian/rules @@ -1,110 +1,15 @@ -#!/usr/bin/make -f +#! /usr/bin/make -f -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# This has to be exported to make some magic below work. -export DH_OPTIONS - -export CFLAGS = -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -CFLAGS += -O0 -else -CFLAGS += -O3 -endif - -# Suppress accidental execution of the auto-* tools, c.f. -# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html -no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ - AUTOCONF="`pwd`/missing autoconf" \ - AUTOMAKE="`pwd`/missing automake" \ - AUTOHEADER="`pwd`/missing autoheader" - -make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) - -post-patches:: - dh_testdir - -build: post-patches build-stamp -build-stamp: - dh_testdir - ./autogen.sh - ./configure --prefix=/usr \ - --mandir=/usr/share/man - $(MAKE) $(make_flags) - - touch build-stamp - -clean:: - dh_testdir - dh_testroot - rm -f build-stamp - - [ ! -f Makefile ] || $(MAKE) clean - [ ! -f Makefile ] || $(MAKE) distclean - - dh_clean - -install: DH_OPTIONS= -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install - - dh_movefiles - - # Library package - dh_install -plibcarddav --autodest debian/tmp/usr/lib/libcarddav.so* - - # Developer package - dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/libcarddav.la - dh_install -plibcarddav-dev --autodest debian/tmp/usr/include/libcarddav/* - dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/pkgconfig/* - -# This single target is used to build all the packages, all at once, or -# one at a time. So keep in mind: any options passed to commands here will -# affect _all_ packages. Anything you want to only affect one package -# should be put in another target, such as the install target. -binary-common: - dh_testdir - dh_testroot - dh_installdocs -A debian/README.Debian - dh_installexamples - dh_installmenu - dh_installcron - dh_installinfo - dh_installchangelogs ChangeLog - dh_link - dh_compress - dh_fixperms - dh_strip - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb $(DEB_DH_BUILDDEB_ARGS) - -# Build architecture independent packages using the common target. -binary-indep: build install - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependent packages using the common target. -binary-arch: build install - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common - -# Any other binary targets build just one binary package at a time. -binary-%: build install - make -f debian/rules binary-common DH_OPTIONS=-p$* - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DWITH_ALL_OPTIONS="ON" \ + -DBUILD_ALL="ON" diff --git a/debian/_base/dependencies/libcarddav/debian/watch b/debian/_base/dependencies/libcarddav/debian/watch deleted file mode 100644 index 8cea7d35f..000000000 --- a/debian/_base/dependencies/libcarddav/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz diff --git a/ubuntu/_base/dependencies/libcarddav/debian/README.Debian b/ubuntu/_base/dependencies/libcarddav/debian/README.Debian deleted file mode 100644 index 9adebeacc..000000000 --- a/ubuntu/_base/dependencies/libcarddav/debian/README.Debian +++ /dev/null @@ -1,45 +0,0 @@ - Imlib Version 11 - ---------------- - -Imlib11 is linked with libpng12, which began life as libpng3. This is -in accordance with the practice of Redhat. The GDK version of imlib, -being part of GNOME 1, has remained linked with libpng2. - -No library that links with this version of Imlib may also link with -libpng2. - -No application that links with this version of Imlib may link with -libpng2, neither directly nor through a third library. - -If you accidentally link an application with imlib and libpng2, the -application may behave in unpredictible ways, possibly crashing, -possibly emitting warnings similar to the following: - - libpng warning: Application was compiled with png.h from libpng-1.2.1 - libpng warning: Application is running with png.c from libpng-1.0.12 - libpng error: Incompatible libpng version in application and library - - - - Imlib Version 1 - --------------- - -Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to -build with libpng2, install the package imlib1-dev or gdk-imlib1-dev -as appropriate. - - - The Palette File - ---------------- - -The system Imlib/Gdk-Imlib palette file was moved from the directory -`/etc/im' to `/etc/imlib'. This move may cause problems for users who -have a `.imrc' file in their home directory since that file may -contain a reference to the old location of the palette file. To -correct this problem, the "PaletteFile" entry should look like: - - PaletteFile /etc/imlib/im_palette.pal - -I believe this changed happened in late 1999. - - -- Steve M. Robbins , Sun Oct 19 15:11:42 2003 diff --git a/ubuntu/_base/dependencies/libcarddav/debian/README.fallback b/ubuntu/_base/dependencies/libcarddav/debian/README.fallback deleted file mode 100644 index 1b41c225f..000000000 --- a/ubuntu/_base/dependencies/libcarddav/debian/README.fallback +++ /dev/null @@ -1,23 +0,0 @@ - Imlib Image Conversion - ---------------------- - -The imlib and gdk-imlib libraries have a number of built-in image -conversion routines, and are capable of loading or saving in *at -least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and -PPM. - -Prior to version 1.9.13, imlib and gdk-imlib could use an external -program, such as Imagemagick's "convert", to load or save images -in formats not handled internally to Imlib. - - - - "All fallbacks failed." - ----------------------- - -This message indicates that the file you wished to load is not handled -by Imlib. - -The remedy is to convert the image file by hand using, for example, -Imagemagick's "convert" command: "convert foo.rgb foo.png". Then -you'll have to fix up the application to use the new filename instead. diff --git a/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..7a55130b2 --- /dev/null +++ b/ubuntu/_base/dependencies/libcarddav/debian/cdbs/debian-tde.mk @@ -0,0 +1,218 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# 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: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +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_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + 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); \ + 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; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + 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 +endif + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/dependencies/libcarddav/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/libcarddav/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/dependencies/libcarddav/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/dependencies/libcarddav/debian/control b/ubuntu/_base/dependencies/libcarddav/debian/control index c2409ffd1..961e1f94d 100644 --- a/ubuntu/_base/dependencies/libcarddav/debian/control +++ b/ubuntu/_base/dependencies/libcarddav/debian/control @@ -1,8 +1,8 @@ Source: libcarddav -Build-Depends: cdbs, debhelper (>= 7.0.50~), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev Section: graphics Priority: optional Maintainer: Timothy Pearson +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, libcurl4-gnutls-dev, libglib2.0-dev Standards-Version: 3.8.4 Package: libcarddav diff --git a/ubuntu/_base/dependencies/libcarddav/debian/libcarddav-dev.install b/ubuntu/_base/dependencies/libcarddav/debian/libcarddav-dev.install new file mode 100644 index 000000000..ce7045855 --- /dev/null +++ b/ubuntu/_base/dependencies/libcarddav/debian/libcarddav-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/libcarddav/* +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcarddav.so +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcarddav.la +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/* diff --git a/ubuntu/_base/dependencies/libcarddav/debian/libcarddav.install b/ubuntu/_base/dependencies/libcarddav/debian/libcarddav.install new file mode 100644 index 000000000..2fa7b4f2e --- /dev/null +++ b/ubuntu/_base/dependencies/libcarddav/debian/libcarddav.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcarddav.so.* diff --git a/ubuntu/_base/dependencies/libcarddav/debian/rules b/ubuntu/_base/dependencies/libcarddav/debian/rules index 38c17ea44..56e8f5415 100755 --- a/ubuntu/_base/dependencies/libcarddav/debian/rules +++ b/ubuntu/_base/dependencies/libcarddav/debian/rules @@ -1,110 +1,15 @@ -#!/usr/bin/make -f +#! /usr/bin/make -f -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -# This has to be exported to make some magic below work. -export DH_OPTIONS - -export CFLAGS = -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -CFLAGS += -O0 -else -CFLAGS += -O3 -endif - -# Suppress accidental execution of the auto-* tools, c.f. -# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html -no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ - AUTOCONF="`pwd`/missing autoconf" \ - AUTOMAKE="`pwd`/missing automake" \ - AUTOHEADER="`pwd`/missing autoheader" - -make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) - -post-patches:: - dh_testdir - -build: post-patches build-stamp -build-stamp: - dh_testdir - ./autogen.sh - ./configure --prefix=/usr \ - --mandir=/usr/share/man - $(MAKE) $(make_flags) - - touch build-stamp - -clean:: - dh_testdir - dh_testroot - rm -f build-stamp - - [ ! -f Makefile ] || $(MAKE) clean - [ ! -f Makefile ] || $(MAKE) distclean - - dh_clean - -install: DH_OPTIONS= -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install - - dh_movefiles - - # Library package - dh_install -plibcarddav --autodest debian/tmp/usr/lib/libcarddav.so* - - # Developer package - dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/libcarddav.la - dh_install -plibcarddav-dev --autodest debian/tmp/usr/include/libcarddav/* - dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/pkgconfig/* - -# This single target is used to build all the packages, all at once, or -# one at a time. So keep in mind: any options passed to commands here will -# affect _all_ packages. Anything you want to only affect one package -# should be put in another target, such as the install target. -binary-common: - dh_testdir - dh_testroot - dh_installdocs -A debian/README.Debian - dh_installexamples - dh_installmenu - dh_installcron - dh_installinfo - dh_installchangelogs ChangeLog - dh_link - dh_compress - dh_fixperms - dh_strip - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb $(DEB_DH_BUILDDEB_ARGS) - -# Build architecture independent packages using the common target. -binary-indep: build install - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependent packages using the common target. -binary-arch: build install - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common - -# Any other binary targets build just one binary package at a time. -binary-%: build install - make -f debian/rules binary-common DH_OPTIONS=-p$* - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DWITH_ALL_OPTIONS="ON" \ + -DBUILD_ALL="ON" diff --git a/ubuntu/_base/dependencies/libcarddav/debian/watch b/ubuntu/_base/dependencies/libcarddav/debian/watch deleted file mode 100644 index 8cea7d35f..000000000 --- a/ubuntu/_base/dependencies/libcarddav/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz -- cgit v1.2.3