TDE
/
extra-dependencies
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/extra-dependencies.git
0
0
Fork 0
Code Issues Releases Wiki Activity

compiz: Build without support for gconf.

Browse Source 
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/11/head
Slávek Banko 1 year ago
parent 6b59e98719
commit 52e5ffe140
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
16 changed files with 88 additions and 8 deletions
Show Stats Download Patch File Download Diff File

6
debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/changelog vendored
Unescape View File

@ -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 <slavek.banko@axis.cz> 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

2
debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/control vendored
Unescape View File

@ -2,7 +2,7 @@ Source: compiz-fusion-plugins-extra-trinity
Section: deps-r14/x11
Priority: extra
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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

20
debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/01-disable-gconf.patch vendored
Unescape View File

@ -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

1
debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/series vendored
Unescape View File

@ -1,2 +1,3 @@
crash_fix_4082dc3c.patch
01-disable-gconf.patch

2
debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/rules vendored
Unescape View File

@ -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:

6
debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/changelog vendored
Unescape View File

@ -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 <slavek.banko@axis.cz> 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.

2
debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/control vendored
Unescape View File

@ -2,7 +2,7 @@ Source: compiz-fusion-plugins-main-trinity
Section: deps-r14/x11
Priority: extra
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
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

20
debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/10-disable-gconf.patch vendored
Unescape View File

@ -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

1
debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/series vendored
Unescape View File

@ -4,3 +4,4 @@
06_bug326995.patch
08_disable_desktop_vpswitch.patch
09-multiple-definitions.diff
10-disable-gconf.patch

2
debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/rules vendored
Unescape View File

@ -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:

6
debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog vendored
Unescape View File

@ -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 <slavek.banko@axis.cz> 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

4
debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-trinity-dev.install vendored
Unescape View File

@ -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

2
debian/compiz-trinity/compiz-trinity-0.8.4/debian/control vendored
Unescape View File

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Thierry Reding <thierry@gilfi.de>, David Nusinow <dnusinow@debian.org>
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

19
debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/101-build-without-gconf.patch vendored
Unescape View File

@ -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

1
debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series vendored
Unescape View File

@ -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

2
debian/compiz-trinity/compiz-trinity-0.8.4/debian/rules vendored
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save