Commits

Rodrigo Bistolfi  committed 5a58cb3 Merge

!:nobuild Merged in m0e_lnx/m0e-vabs (pull request #114)

Fix problem with system-config-printer

  • Participants
  • Parent commits 2234e90, 6c0cf12

Comments (0)

Files changed (5)

File var/vabs/gnome-disk-utility/src/gnome-disk-utility.SlackBuild

   --localstatedir=/var \
   --mandir=/usr/man \
   --with-included-gettext \
-  --disable-introspection \
+  --enable-introspection \
   --program-prefix="" \
   --program-suffix="" \
   --build=$CONFIGURE_TRIPLET \

File var/vabs/libunique/src/libunique.SlackBuild

 
 #SYSTEM VARIABLES
 #----------------------------------------------------------------------------
-BUILDNUM=${BUILDNUM:-"1"}
+BUILDNUM=${BUILDNUM:-"2"}
 VL_VERSION=${VL_VERSION:-"$(ls /var/log/packages/|grep vlconfig2|cut -d "-" -f4|cut -c 2-5)"}
 BUILD=${BUILD:-"$BUILDNUM""$VL_VERSION"}
 ARCH=${ARCH:-"$(uname -m)"}
 LDFLAG_OPTIONS=${LDFLAG_OPTIONS:-""}
 ADDRB=${ADDRB:-""} #Add deps that need to be added to the slack-required file here
 EXRB=${EXRB:-""} #Add deps that need to be excluded from the slack-required file here
-MAKEDEPENDS=${MAKEDEPENDS:-"gtk+2 harfbuzz"} #Add deps needed TO BUILD this package here.
+MAKEDEPENDS=${MAKEDEPENDS:-"gtk+2 harfbuzz gobject-introspection"} #Add deps needed TO BUILD this package here.
 #----------------------------------------------------------------------------
 
 # DO NOT EXECUTE if NORUN is set to 1
   --localstatedir=/var \
   --mandir=/usr/man \
   --disable-static \
-  --disable-introspection \
+  --enable-introspection \
   --disable-dbus \
   --program-prefix="" \
   --program-suffix="" \

File var/vabs/pygobject/src/patches/pygobject-2.28.6-introspection-1.patch

+Submitted By: Andrew Benton <andy@benton.eu.com>
+Date: 2012-03-29
+Initial Package Version: 2.28.6
+Upstream Status: not submitted
+Origin: me
+Description: Fixes compiling with a recent version of gobject-introspection
+
+--- pygobject-2.28.6/gi/pygi-info.c-orig	2012-03-29 02:27:37.494228732 +0100
++++ pygobject-2.28.6/gi/pygi-info.c	2012-03-29 02:26:37.735132310 +0100
+@@ -162,9 +162,6 @@
+         case GI_INFO_TYPE_CONSTANT:
+             type = &PyGIConstantInfo_Type;
+             break;
+-        case GI_INFO_TYPE_ERROR_DOMAIN:
+-            type = &PyGIErrorDomainInfo_Type;
+-            break;
+         case GI_INFO_TYPE_UNION:
+             type = &PyGIUnionInfo_Type;
+             break;
+@@ -481,7 +478,6 @@
+                 case GI_INFO_TYPE_INVALID:
+                 case GI_INFO_TYPE_FUNCTION:
+                 case GI_INFO_TYPE_CONSTANT:
+-                case GI_INFO_TYPE_ERROR_DOMAIN:
+                 case GI_INFO_TYPE_VALUE:
+                 case GI_INFO_TYPE_SIGNAL:
+                 case GI_INFO_TYPE_PROPERTY:
+@@ -860,7 +856,6 @@
+                     case GI_INFO_TYPE_INVALID:
+                     case GI_INFO_TYPE_FUNCTION:
+                     case GI_INFO_TYPE_CONSTANT:
+-                    case GI_INFO_TYPE_ERROR_DOMAIN:
+                     case GI_INFO_TYPE_VALUE:
+                     case GI_INFO_TYPE_SIGNAL:
+                     case GI_INFO_TYPE_PROPERTY:

File var/vabs/pygobject/src/pygobject.SlackBuild

 NAME=pygobject
 VERSION=${VERSION:-2.28.6}
 BASEVER=$(echo $VERSION | cut -f 1-2 -d .)
-BUILDNUM=${BUILDNUM:-1}
+BUILDNUM=${BUILDNUM:-2}
 LINK=${LINK:-"ftp://ftp.gnome.org/pub/gnome/sources/$NAME/$BASEVER/$NAME-$VERSION.tar.bz2"}
 NUMJOBS=${NUMJOBS:-" -j6 "}
 VL_VERSION=${VL_VERSION:-"$(ls /var/log/packages/|grep vlconfig2|cut -d "-" -f4|cut -c 2-5)"}
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-#zcat $CWD/pygobject.fix.no.introspection.crash.diff.gz | patch -p1 --verbose || exit 1
+patch -Np1 --verbose < $CWD/patches/pygobject-2.28.6-introspection-1.patch || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --disable-introspection \
+  --enable-introspection \
   --build=$CONFIGURE_TRIPLET $CONFIG_OPTIONS || exit 1
 
 make $NUMJOBS || exit 1

File var/vabs/system-config-printer/src/system-config-printer.SlackBuild

 # Set initial variables:
 NAME="system-config-printer"
 VERSION=${VERSION:-1.3.13}
+BASEVER=$(echo $VERSION | cut -f 1-2 -d .)
 BUILDNUM=${BUILDNUM:-"1"}
 VL_VERSION=${VL_VERSION:-"$(ls /var/log/packages/|grep vlconfig2|cut -d "-" -f4|cut -c 2-5)"}
 BUILD=${BUILD:-"$BUILDNUM""$VL_VERSION"}
-LINK=${LINK:-"http://cyberelk.net/tim/data/$NAME/1.3/$NAME-$VERSION.tar.xz"}
-MAKEDEPENDS=${MAKEDEPENDS:-"avahi cups cups-filters pycups libusb-compat desktop-file-utils pygtk pycurl dbus dbus-glib notify-python pygobject pycairo dbus-python"}
+LINK=${LINK:-"http://cyberelk.net/tim/data/$NAME/$BASEVER/$NAME-$VERSION.tar.xz"}
+MAKEDEPENDS=${MAKEDEPENDS:-"avahi cups cups-filters pycups libusb-compat desktop-file-utils pygtk pycurl dbus dbus-glib notify-python gobject-introspection pygobject pycairo dbus-python"}
 ADDRB=${ADDRB:-"pycups >= 1.9, pycairo >= 1.8 "}
 
 if [ "$NORUN" != 1 ]; then