Hi! I got a sponsor a bit faster than expected.
Here is the patch. /Sune
diff -u baghira-0.7a/debian/control baghira-0.7a/debian/control
--- baghira-0.7a/debian/control
+++ baghira-0.7a/debian/control
@@ -2,7 +2,7 @@
Section: kde
Priority: optional
Maintainer: Jose Luis Tallon <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.2.0), autotools-dev, libqt3-mt-dev, kdebase-dev(>= 3.4), kdelibs4-dev(>= 3.4), kwin(>= 3.4), libxtst-dev
+Build-Depends: debhelper (>= 4.2.0), autotools-dev, libqt3-mt-dev, kdebase-dev(>= 3.4), kdelibs4-dev(>= 3.4), kwin(>= 3.4), libxtst-dev, autoconf, automake1.9
Standards-Version: 3.6.2
Package: kwin-baghira
diff -u baghira-0.7a/debian/rules baghira-0.7a/debian/rules
--- baghira-0.7a/debian/rules
+++ baghira-0.7a/debian/rules
@@ -23,6 +23,7 @@
config.status: configure
dh_testdir
+ make -f Makefile.cvs
test -e config.sub -a -L config.sub || \
ln -sf /usr/share/misc/config.sub config.sub
test -e config.guess -a -L config.guess || \
diff -u baghira-0.7a/debian/changelog baghira-0.7a/debian/changelog
--- baghira-0.7a/debian/changelog
+++ baghira-0.7a/debian/changelog
@@ -1,3 +1,11 @@
+baghira (0.7a-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fixes sidebar building (Closes: 345872)
+ * Fixes build with gcc-4.1, thanks to Martin Michlmayr (Closes: #356583)
+
+ -- Sune Vuorela <[EMAIL PROTECTED]> Wed, 10 May 2006 21:56:15 +0000
+
baghira (0.7a-1) unstable; urgency=low
* New upstream version
only in patch2:
unchanged:
--- baghira-0.7a.orig/deco/baghiraclient.h
+++ baghira-0.7a/deco/baghiraclient.h
@@ -159,8 +159,8 @@
virtual KDecoration *createDecoration(KDecorationBridge *b);
virtual bool reset(unsigned long changed);
virtual QValueList<BorderSize> borderSizes() const;
- static QPixmap &BaghiraFactory::ButtonPixmap(Baghira::WindowState wState, Baghira::ButtonType type, Baghira::ButtonState state, int current, bool small);
- QImage* BaghiraFactory::DecoImage(QPixmap *pix, int x, int y, int width, int height);
+ static QPixmap &ButtonPixmap(Baghira::WindowState wState, Baghira::ButtonType type, Baghira::ButtonState state, int current, bool small);
+ QImage* DecoImage(QPixmap *pix, int x, int y, int width, int height);
static QBitmap helpMask, jaguarDownMask, jaguarMenuDownMask,
jaguarMenuMask, jaguarMask, milkMenuDownMask,
only in patch2:
unchanged:
--- baghira-0.7a.orig/kickermenu/configure.in.in
+++ baghira-0.7a/kickermenu/configure.in.in
@@ -1,2 +1,2 @@
-AM_CONDITIONAL( HAVE_3_4, test "$(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2)" = "4" )
+AM_CONDITIONAL( HAVE_3_4, test "$(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2)" -ge "4" )
only in patch2:
unchanged:
--- baghira-0.7a.orig/configure
+++ baghira-0.7a/configure
@@ -32572,7 +32572,7 @@
-if test "$(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2)" = "4" ; then
+if test "$(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2)" -ge "4" ; then
HAVE_3_4_TRUE=
HAVE_3_4_FALSE='#'
else
@@ -32584,7 +32584,7 @@
-if test "$(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2)" = "4" ; then
+if test "$(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2)" -ge "4" ; then
HAVE_3_4_TRUE=
HAVE_3_4_FALSE='#'
else
only in patch2:
unchanged:
--- baghira-0.7a.orig/sidebar/configure.in.in
+++ baghira-0.7a/sidebar/configure.in.in
@@ -1,2 +1,2 @@
-AM_CONDITIONAL( HAVE_3_4, test "$(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2)" = "4" )
+AM_CONDITIONAL( HAVE_3_4, test "$(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2)" -ge "4" )
only in patch2:
unchanged:
--- baghira-0.7a.orig/Makefile.in
+++ baghira-0.7a/Makefile.in
@@ -818,7 +818,7 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=subdirs Makefile.in configure.files config.h.in install.sh babstart configure.in Makefile.cvs updatePredefs aclocal.m4 configure Makefile.am acinclude.m4
+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in install.sh babstart configure.in Makefile.cvs updatePredefs aclocal.m4 acinclude.m4 configure Makefile.am
#>+ 2
docs-am:
only in patch2:
unchanged:
--- baghira-0.7a.orig/configure.in
+++ baghira-0.7a/configure.in
@@ -73,13 +73,13 @@
dnl FILE: ./kickermenu/configure.in.in
dnl =======================================================
-AM_CONDITIONAL( HAVE_3_4, test "$(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2)" = "4" )
+AM_CONDITIONAL( HAVE_3_4, test "$(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2)" -ge "4" )
dnl =======================================================
dnl FILE: ./sidebar/configure.in.in
dnl =======================================================
-AM_CONDITIONAL( HAVE_3_4, test "$(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2)" = "4" )
+AM_CONDITIONAL( HAVE_3_4, test "$(kde-config --version | grep "KDE:" | cut -d" " -f2 | cut -d"." -f2)" -ge "4" )
KDE_CREATE_SUBDIRSLIST
AC_CONFIG_FILES([ Makefile ])
pgpTjSzRuaFct.pgp
Description: PGP signature
