diff --git a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/changelog b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/changelog index 9ccde4dc..a9df3e15 100644 --- a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/changelog +++ b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/changelog @@ -1,3 +1,9 @@ +compiz-fusion-plugins-extra-trinity (0.8.4-3debian13.0.0+5~a) trixie; urgency=low + + * Build without support for gconf. + + -- Slávek Banko Fri, 27 Oct 2023 02:24:42 +0200 + compiz-fusion-plugins-extra-trinity (0.8.4-3debian11.0.0+4~a) bullseye; urgency=low * Change debhelper compatibility level to 9 diff --git a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/control b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/control index 115725d4..1c55cede 100644 --- a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/control +++ b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/control @@ -2,7 +2,7 @@ Source: compiz-fusion-plugins-extra-trinity Section: deps-r14/x11 Priority: extra Maintainer: Timothy Pearson -Build-Depends: cdbs, debhelper (>= 9~), quilt, pkg-config, compiz-trinity-dev, librsvg2-dev, libcairo2-dev, libsm-dev, intltool, libtool, libdbus-1-dev, libjpeg-dev, compiz-fusion-bcop-trinity, libdecoration0-trinity-dev, xsltproc, libxslt1-dev, libglu1-mesa-dev, compiz-fusion-plugins-main-trinity, libgconf2-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, pkg-config, compiz-trinity-dev, librsvg2-dev, libcairo2-dev, libsm-dev, intltool, libtool, libdbus-1-dev, libjpeg-dev, compiz-fusion-bcop-trinity, libdecoration0-trinity-dev, xsltproc, libxslt1-dev, libglu1-mesa-dev, compiz-fusion-plugins-main-trinity Standards-Version: 3.8.2 Package: compiz-fusion-plugins-extra-trinity diff --git a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/01-disable-gconf.patch b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/01-disable-gconf.patch new file mode 100644 index 00000000..ead20901 --- /dev/null +++ b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/01-disable-gconf.patch @@ -0,0 +1,20 @@ +Index: compiz-fusion-plugins-extra-trinity-0.8.4/configure.ac +=================================================================== +--- compiz-fusion-plugins-extra-trinity-0.8.4.orig/configure.ac ++++ compiz-fusion-plugins-extra-trinity-0.8.4/configure.ac +@@ -161,10 +161,12 @@ if test x"$use_schemas" = x"yes"; then + fi + xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf` + AC_SUBST(xsltdir) +-fi +- +-AM_GCONF_SOURCE_2 + ++ AM_GCONF_SOURCE_2 ++else ++ m4_pattern_allow([AM_GCONF_SOURCE_2]) ++ AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false) ++fi + + AM_CONDITIONAL(USE_SCHEMAS, test "x$use_schemas" = "xyes") + if test "$use_schemas" = yes; then diff --git a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/series b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/series index 84190395..48023fa3 100644 --- a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/series +++ b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/series @@ -1,2 +1,3 @@ crash_fix_4082dc3c.patch +01-disable-gconf.patch diff --git a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/rules b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/rules index 0addb8a2..6fc24371 100755 --- a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/rules +++ b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/rules @@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --enable-schemas --with-gconf-schema-file-dir=/opt/trinity/share/gconf --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include +DEB_CONFIGURE_EXTRA_FLAGS := --enable-schemas --disable-schemas --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include makebuilddir:: debian/stamp-autoreconf debian/stamp-autoreconf: diff --git a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/changelog b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/changelog index f0b246ae..ee8866a9 100644 --- a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/changelog +++ b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/changelog @@ -1,3 +1,9 @@ +compiz-fusion-plugins-main-trinity (0.8.4-3debian13.0.0+6~a) trixie; urgency=low + + * Build without support for gconf. + + -- Slávek Banko Fri, 27 Oct 2023 02:17:39 +0200 + compiz-fusion-plugins-main-trinity (0.8.4-3debian11.0.0+5~a) bullseye; urgency=low * Fix multiple variable definitions that cause FTBFS. diff --git a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/control b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/control index 15b4e9cf..4bc058ea 100644 --- a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/control +++ b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/control @@ -2,7 +2,7 @@ Source: compiz-fusion-plugins-main-trinity Section: deps-r14/x11 Priority: extra Maintainer: Timothy Pearson -Build-Depends: cdbs, debhelper (>= 9~), quilt, pkg-config, compiz-trinity-dev, librsvg2-dev, libcairo2-dev, libsm-dev, intltool, libtool, libdbus-1-dev, libjpeg-dev, compiz-fusion-bcop-trinity, libdecoration0-trinity-dev, xsltproc, libxslt1-dev, libglu1-mesa-dev, libgconf2-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, pkg-config, compiz-trinity-dev, librsvg2-dev, libcairo2-dev, libsm-dev, intltool, libtool, libdbus-1-dev, libjpeg-dev, compiz-fusion-bcop-trinity, libdecoration0-trinity-dev, xsltproc, libxslt1-dev, libglu1-mesa-dev Standards-Version: 3.8.2 Package: compiz-fusion-plugins-main-trinity diff --git a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/10-disable-gconf.patch b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/10-disable-gconf.patch new file mode 100644 index 00000000..f1d71bf1 --- /dev/null +++ b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/10-disable-gconf.patch @@ -0,0 +1,20 @@ +Index: compiz-fusion-plugins-main-trinity-0.8.4/configure.ac +=================================================================== +--- compiz-fusion-plugins-main-trinity-0.8.4.orig/configure.ac ++++ compiz-fusion-plugins-main-trinity-0.8.4/configure.ac +@@ -173,10 +173,12 @@ if test x"$use_schemas" = x"yes"; then + fi + xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf` + AC_SUBST(xsltdir) +-fi +- +-AM_GCONF_SOURCE_2 + ++ AM_GCONF_SOURCE_2 ++else ++ m4_pattern_allow([AM_GCONF_SOURCE_2]) ++ AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false) ++fi + + AM_CONDITIONAL(USE_SCHEMAS, test "x$use_schemas" = "xyes") + if test "$use_schemas" = yes; then diff --git a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/series b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/series index 3a80cbd7..229ab27f 100644 --- a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/series +++ b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/series @@ -4,3 +4,4 @@ 06_bug326995.patch 08_disable_desktop_vpswitch.patch 09-multiple-definitions.diff +10-disable-gconf.patch diff --git a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/rules b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/rules index 0addb8a2..6fc24371 100755 --- a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/rules +++ b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/rules @@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) -DEB_CONFIGURE_EXTRA_FLAGS := --enable-schemas --with-gconf-schema-file-dir=/opt/trinity/share/gconf --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include +DEB_CONFIGURE_EXTRA_FLAGS := --enable-schemas --disable-schemas --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include makebuilddir:: debian/stamp-autoreconf debian/stamp-autoreconf: diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog index 7311d09a..05aec035 100644 --- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog @@ -1,3 +1,9 @@ +compiz-trinity (0.8.4-3debian13.0.0+9~a) trixie; urgency=low + + * Build without support for gconf. + + -- Slávek Banko Tue, 24 Oct 2023 18:34:12 +0200 + compiz-trinity (0.8.4-3debian13.0.0+8~a) trixie; urgency=low * Update Q_OBJECT => TQ_OBJECT in TDE R14.x patch diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-trinity-dev.install b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-trinity-dev.install index 2f2aedfa..59d18718 100644 --- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-trinity-dev.install +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-trinity-dev.install @@ -6,6 +6,6 @@ /opt/trinity/include/compiz/compiz-scale.h opt/trinity/lib/pkgconfig/compiz.pc opt/trinity/lib/pkgconfig/compiz-cube.pc -opt/trinity/lib/pkgconfig/compiz-gconf.pc +#opt/trinity/lib/pkgconfig/compiz-gconf.pc opt/trinity/lib/pkgconfig/compiz-scale.pc -/opt/trinity/share/compiz/schemas.xslt +#/opt/trinity/share/compiz/schemas.xslt diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/control b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/control index c98a41f1..02b9822e 100644 --- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/control +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian X Strike Force Uploaders: Thierry Reding , David Nusinow -Build-Depends: debhelper (>= 9~), quilt (>= 0.40), automake, libtool, libglib2.0-dev, libgconf2-dev, libpng-dev, libxcomposite-dev (>= 1:0.3-2), libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>=1:1.0.3), libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 1:0.9.1), libice-dev(>= 1:1.0.1), libsm-dev (>= 1:1.0.1), libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev, libdbus-glib-1-dev, libwnck-dev, x11proto-gl-dev (>= 1.4.8), libxinerama-dev, tdebase-trinity-dev, libdbus-tqt-1-dev, libxcursor-dev, libxml2-dev, libxslt1-dev, libxml-parser-perl, libglu1-mesa-dev, xsltproc, libx11-xcb-dev, intltool +Build-Depends: debhelper (>= 9~), quilt (>= 0.40), automake, libtool, libglib2.0-dev, libpng-dev, libxcomposite-dev (>= 1:0.3-2), libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>=1:1.0.3), libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 1:0.9.1), libice-dev(>= 1:1.0.1), libsm-dev (>= 1:1.0.1), libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev, libdbus-glib-1-dev, libwnck-dev, x11proto-gl-dev (>= 1.4.8), libxinerama-dev, tdebase-trinity-dev, libdbus-tqt-1-dev, libxcursor-dev, libxml2-dev, libxslt1-dev, libxml-parser-perl, libglu1-mesa-dev, xsltproc, libx11-xcb-dev, intltool Standards-Version: 3.8.4 Package: compiz-trinity diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/101-build-without-gconf.patch b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/101-build-without-gconf.patch new file mode 100644 index 00000000..9468b873 --- /dev/null +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/101-build-without-gconf.patch @@ -0,0 +1,19 @@ +Index: compiz-trinity-0.8.4/configure.ac +=================================================================== +--- compiz-trinity-0.8.4.orig/configure.ac ++++ compiz-trinity-0.8.4/configure.ac +@@ -192,9 +192,12 @@ if test "x$use_gconf" = "xyes"; then + if test x"$GCONFTOOL" = xno; then + AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) + fi +-fi + +-AM_GCONF_SOURCE_2 ++ AM_GCONF_SOURCE_2 ++else ++ m4_pattern_allow([AM_GCONF_SOURCE_2]) ++ AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false) ++fi + + AM_CONDITIONAL(USE_GCONF, test "x$use_gconf" = "xyes") + if test "$use_gconf" = yes; then diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series index 266927cb..aa3a9cdb 100644 --- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series @@ -21,3 +21,4 @@ kubuntu_04_trinity.patch 099-trinity.patch 099-fix-dso-link.patch 100-tde-r14.patch +101-build-without-gconf.patch diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/rules b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/rules index ef8ee549..7e4dd77d 100755 --- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/rules +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/rules @@ -55,7 +55,7 @@ confflags += --disable-static \ --disable-kde \ --enable-tde \ --enable-librsvg \ - --enable-gconf-dump \ + --disable-gconf \ --with-default-plugins="$(PLUGINS)" \ --prefix=/opt/trinity \ --with-extra-libs=/opt/trinity/lib