[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2020-04-08 Thread Felix Yan via arch-commits 
Date: Thursday, April 9, 2020 @ 01:04:16
  Author: felixonmars
Revision: 379883

libffi 3.3 rebuild

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-09 00:49:28 UTC (rev 379882)
+++ PKGBUILD2020-04-09 01:04:16 UTC (rev 379883)
@@ -4,7 +4,7 @@
 pkgbase=pygobject2
 pkgname=(python2-gobject2)
 pkgver=2.28.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Legacy Python 2 bindings for GObject"
 url="https://wiki.gnome.org/Projects/PyGObject";
 arch=(x86_64)

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2019-11-17 Thread Jan Steffens via arch-commits 
Date: Sunday, November 17, 2019 @ 15:07:53
  Author: heftig
Revision: 368989

2.28.7-4: Remove broken Python 3 support

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |   55 +++
 1 file changed, 15 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-17 14:55:29 UTC (rev 368988)
+++ PKGBUILD2019-11-17 15:07:53 UTC (rev 368989)
@@ -1,16 +1,19 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Maintainer: Jan de Groot 
 
 pkgbase=pygobject2
-pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
+pkgname=(python2-gobject2)
 pkgver=2.28.7
-pkgrel=3
-pkgdesc="Python bindings for GObject (legacy)"
+pkgrel=4
+pkgdesc="Legacy Python 2 bindings for GObject"
 url="https://wiki.gnome.org/Projects/PyGObject";
 arch=(x86_64)
 license=(LGPL)
-depends=(glib2)
-makedepends=(python python2 git)
-options=(!emptydirs)
+depends=(glib2 python2)
+makedepends=(git)
+provides=("pygobject2-devel=$pkgver-$pkgrel")
+conflicts=('pygobject2-devel')
+replaces=('pygobject2-devel<=2.28.7-3')
 _commit=c9594b6a91e6ca2086fedec2ed8249e0a9c029fc  # tags/PYGOBJECT_2_28_7^0
 source=("git+https://gitlab.gnome.org/GNOME/pygobject.git#commit=$_commit";)
 sha256sums=('SKIP')
@@ -21,49 +24,21 @@
 }
 
 prepare() {
-  mkdir build-py{2,3} devel
   cd pygobject
   find . \( -name '*.py' -o -name '*.py.in' \) -exec sed -i '1s|python$|&2|' 
{} +
   autoreconf -fvi
 }
 
-_build() (
-  cd build-py$1
-  ../pygobject/configure --prefix=/usr --disable-introspection 
PYTHON=/usr/bin/python$1
+build() (
+  cd pygobject
+  CPPFLAGS+=' -Wno-deprecated-declarations'
+  ./configure --prefix=/usr --disable-introspection PYTHON=/usr/bin/python2
   sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 )
 
-build() {
-  _build 2
-  _build 3
-}
-
-package_python-gobject2() {
-  depends=("pygobject2-devel=$pkgver" python)
-
-  cd build-py3
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/usr/{include,lib/pkgconfig,share/pygobject/xsl}
-  rm -r "$pkgdir"/usr/share/gtk-doc
-}
-
 package_python2-gobject2() {
-  pkgdesc="${pkgdesc/Python/Python2}"
-  depends=("pygobject2-devel=$pkgver" python2)
-
-  cd build-py2
+  cd pygobject
   make DESTDIR="$pkgdir" install
-  mv "$pkgdir"/usr/{include,lib/pkgconfig,share/pygobject/xsl} "$srcdir/devel"
-  rm -r "$pkgdir"/usr/share/gtk-doc
+  rm -r "$pkgdir/usr/share/gtk-doc"
 }
-
-package_pygobject2-devel() {
-  pkgdesc="Common development files for pygobject2"
-
-  cd devel
-  mkdir -p "$pkgdir"/usr/{lib,share/pygobject}
-  mv include "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-  mv xsl "$pkgdir/usr/share/pygobject/"
-}

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2019-11-17 Thread Jan Steffens via arch-commits 
Date: Sunday, November 17, 2019 @ 14:55:29
  Author: heftig
Revision: 368988

fix urls

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-17 14:12:58 UTC (rev 368987)
+++ PKGBUILD2019-11-17 14:55:29 UTC (rev 368988)
@@ -5,7 +5,7 @@
 pkgver=2.28.7
 pkgrel=3
 pkgdesc="Python bindings for GObject (legacy)"
-url="http://www.pygtk.org/";
+url="https://wiki.gnome.org/Projects/PyGObject";
 arch=(x86_64)
 license=(LGPL)
 depends=(glib2)
@@ -12,7 +12,7 @@
 makedepends=(python python2 git)
 options=(!emptydirs)
 _commit=c9594b6a91e6ca2086fedec2ed8249e0a9c029fc  # tags/PYGOBJECT_2_28_7^0
-source=("git+https://git.gnome.org/browse/pygobject#commit=$_commit";)
+source=("git+https://gitlab.gnome.org/GNOME/pygobject.git#commit=$_commit";)
 sha256sums=('SKIP')
 
 pkgver() {

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2019-11-04 Thread Felix Yan via arch-commits 
Date: Monday, November 4, 2019 @ 08:36:18
  Author: felixonmars
Revision: 366702

Python 3.8 rebuild

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 08:21:52 UTC (rev 366701)
+++ PKGBUILD2019-11-04 08:36:18 UTC (rev 366702)
@@ -3,7 +3,7 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings for GObject (legacy)"
 url="http://www.pygtk.org/";
 arch=(x86_64)

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2018-06-30 Thread Felix Yan via arch-commits 
Date: Saturday, June 30, 2018 @ 18:04:19
  Author: felixonmars
Revision: 327875

Python 3.7 rebuild

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-30 17:58:34 UTC (rev 327874)
+++ PKGBUILD2018-06-30 18:04:19 UTC (rev 327875)
@@ -4,7 +4,7 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for GObject (legacy)"
 url="http://www.pygtk.org/";
 arch=(x86_64)

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2017-12-10 Thread Jan Steffens via arch-commits 
Date: Sunday, December 10, 2017 @ 16:48:36
  Author: heftig
Revision: 312067

2.28.7-1

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |   82 +
 1 file changed, 39 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-10 16:44:38 UTC (rev 312066)
+++ PKGBUILD2017-12-10 16:48:36 UTC (rev 312067)
@@ -3,72 +3,68 @@
 
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
-pkgver=2.28.6
-pkgrel=13
+pkgver=2.28.7
+pkgrel=1
+pkgdesc="Python bindings for GObject (legacy)"
+url="http://www.pygtk.org/";
 arch=(x86_64)
-url="http://www.pygtk.org/";
 license=(LGPL)
+depends=(glib2)
 makedepends=(python python2 git)
-
-# pygobject-2-28 branch: 
https://git.gnome.org/browse/pygobject/log/?h=pygobject-2-28
-source=('git://git.gnome.org/pygobject#commit=9456ba7')
+options=(!emptydirs)
+_commit=c9594b6a91e6ca2086fedec2ed8249e0a9c029fc  # tags/PYGOBJECT_2_28_7^0
+source=("git+https://git.gnome.org/browse/pygobject#commit=$_commit";)
 sha256sums=('SKIP')
 
+pkgver() {
+  cd pygobject
+  git describe --tags | sed 's/^PYGOBJECT_//;s/_/./g;s/-/+/g'
+}
+
 prepare() {
+  mkdir build-py{2,3} devel
   cd pygobject
-  autoreconf -fi
-
-  cp -a . ../python2-build
-
-  find -O3 ../python2-build \
-\( -name '*.py' -o -name '*.py.in' \) \
--exec sed -i '1s|python$|&2|' {} +
+  find . \( -name '*.py' -o -name '*.py.in' \) -exec sed -i '1s|python$|&2|' 
{} +
+  autoreconf -fvi
 }
 
-build() {
-  cd python2-build
-  ./configure --prefix=/usr --disable-introspection \
-PYTHON=/usr/bin/python2
+_build() (
+  cd build-py$1
+  ../pygobject/configure --prefix=/usr --disable-introspection 
PYTHON=/usr/bin/python$1
+  sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
+)
 
-  cd ../pygobject
-  ./configure --prefix=/usr --disable-introspection
-  make
+build() {
+  _build 2
+  _build 3
 }
 
 package_python-gobject2() {
-  pkgdesc="Python 3 bindings for GObject2"
-  depends=(glib2 pygobject2-devel python)
-  replaces=(py3gobject)
-  provides=("py3gobject=$pkgver")
+  depends=("pygobject2-devel=$pkgver" python)
 
-  cd pygobject
+  cd build-py3
   make DESTDIR="$pkgdir" install
-
-  # Delete devel stuff
-  rm -r "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}}
+  rm -r "$pkgdir"/usr/{include,lib/pkgconfig,share/pygobject/xsl}
+  rm -r "$pkgdir"/usr/share/gtk-doc
 }
 
 package_python2-gobject2() {
-  pkgdesc="Python 2 bindings for GObject2"
-  depends=(glib2 pygobject2-devel python2)
-  replaces=(pygobject)
-  provides=("pygobject=$pkgver")
+  pkgdesc="${pkgdesc/Python/Python2}"
+  depends=("pygobject2-devel=$pkgver" python2)
 
-  cd python2-build
+  cd build-py2
   make DESTDIR="$pkgdir" install
-
+  mv "$pkgdir"/usr/{include,lib/pkgconfig,share/pygobject/xsl} "$srcdir/devel"
   rm -r "$pkgdir"/usr/share/gtk-doc
-
-  # Split devel stuff
-  cd ..
-  mkdir -p devel/usr/{lib,share/pygobject}
-  mv {"$pkgdir",devel}/usr/include
-  mv {"$pkgdir",devel}/usr/lib/pkgconfig
-  mv {"$pkgdir",devel}/usr/share/pygobject/xsl
 }
 
 package_pygobject2-devel() {
-  pkgdesc="Development files for the pygobject bindings"
-  mv devel/* "$pkgdir"
+  pkgdesc="Common development files for pygobject2"
+
+  cd devel
+  mkdir -p "$pkgdir"/usr/{lib,share/pygobject}
+  mv include "$pkgdir/usr/"
+  mv pkgconfig "$pkgdir/usr/lib/"
+  mv xsl "$pkgdir/usr/share/pygobject/"
 }

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2016-12-24 Thread Bartłomiej Piotrowski 
Date: Saturday, December 24, 2016 @ 11:34:41
  Author: bpiotrowski
Revision: 284618

Python 3.6 rebuild

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-24 11:30:34 UTC (rev 284617)
+++ PKGBUILD2016-12-24 11:34:41 UTC (rev 284618)
@@ -4,7 +4,7 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=12
+pkgrel=13
 arch=(i686 x86_64)
 url="http://www.pygtk.org/";
 license=(LGPL)

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2015-09-19 Thread Jan Steffens 
Date: Saturday, September 19, 2015 @ 22:07:54
  Author: heftig
Revision: 246690

py3.5

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-19 19:54:30 UTC (rev 246689)
+++ PKGBUILD2015-09-19 20:07:54 UTC (rev 246690)
@@ -4,7 +4,7 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=11
+pkgrel=12
 arch=(i686 x86_64)
 url="http://www.pygtk.org/";
 license=(LGPL)

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2014-08-31 Thread Jan Steffens 
Date: Sunday, August 31, 2014 @ 21:52:14
  Author: heftig
Revision: 220850

Don't patch python files post-install

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-31 19:51:34 UTC (rev 220849)
+++ PKGBUILD2014-08-31 19:52:14 UTC (rev 220850)
@@ -4,7 +4,7 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=10
+pkgrel=11
 arch=(i686 x86_64)
 url="http://www.pygtk.org/";
 license=(LGPL)
@@ -18,8 +18,11 @@
   cd pygobject
   autoreconf -fi
 
-  cd ..
-  cp -a pygobject python2-build
+  cp -a . ../python2-build
+
+  find -O3 ../python2-build \
+\( -name '*.py' -o -name '*.py.in' \) \
+-exec sed -i '1s|python$|&2|' {} +
 }
 
 build() {
@@ -55,9 +58,6 @@
   cd python2-build
   make DESTDIR="$pkgdir" install
 
-  find "$pkgdir"/usr/share/pygobject -name '*.py' -exec \
-sed -i '1s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' {} +
-
   rm -r "$pkgdir"/usr/share/gtk-doc
 
   # Split devel stuff

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2014-03-17 Thread Jan Steffens 
Date: Monday, March 17, 2014 @ 22:37:37
  Author: heftig
Revision: 208095

python3.4 rebuild

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-17 20:55:35 UTC (rev 208094)
+++ PKGBUILD2014-03-17 21:37:37 UTC (rev 208095)
@@ -4,7 +4,7 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=9
+pkgrel=10
 arch=(i686 x86_64)
 url="http://www.pygtk.org/";
 license=(LGPL)

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2012-10-20 Thread Jan Steffens 
Date: Saturday, October 20, 2012 @ 04:59:40
  Author: heftig
Revision: 169376

Actually apply that python2 patch

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |   38 ++
 1 file changed, 18 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-20 08:42:34 UTC (rev 169375)
+++ PKGBUILD2012-10-20 08:59:40 UTC (rev 169376)
@@ -4,7 +4,7 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url="http://www.pygtk.org/";
 license=('LGPL')
@@ -20,9 +20,15 @@
 '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
 
 build() {
-  cd "${srcdir}"
+  cd pygobject-$pkgver
+
+  # patches available in 2.28 branch but unreleased.
+  patch -Np1 -i "${srcdir}/python2-fix-type.patch"
+  patch -Np1 -i "${srcdir}/python3-fix-build.patch"
+  patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
+
+  cd ..
   cp -a "pygobject-${pkgver}" python2-build
-  mkdir devel
 
   (
 cd python2-build
@@ -33,11 +39,6 @@
 
   (
 cd "pygobject-${pkgver}"
-#patches available in 2.28 branch but unreleased.
-patch -Np1 -i "${srcdir}/python2-fix-type.patch"
-patch -Np1 -i "${srcdir}/python3-fix-build.patch"
-patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
-
 ./configure --prefix=/usr --disable-introspection
 make
   )
@@ -49,7 +50,7 @@
   replaces=('py3gobject')
   provides=("py3gobject=$pkgver")
 
-  cd "${srcdir}/pygobject-${pkgver}"
+  cd pygobject-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   # Delete devel stuff
@@ -62,25 +63,22 @@
   replaces=('pygobject')
   provides=("pygobject=$pkgver")
 
-  cd "${srcdir}/python2-build"
+  cd python2-build
   make DESTDIR="${pkgdir}" install
 
   find "$pkgdir"/usr/share/pygobject -name '*.py' | \
 xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
 
   # Split devel stuff
-  mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \
-"$srcdir/devel/"
+  cd ..
+  mkdir -p devel/usr/{lib,share/pygobject}
+  mv {"$pkgdir",devel}/usr/include
+  mv {"$pkgdir",devel}/usr/lib/pkgconfig
+  mv {"$pkgdir",devel}/usr/share/gtk-doc
+  mv {"$pkgdir",devel}/usr/share/pygobject/xsl
 }
 
 package_pygobject2-devel() {
   pkgdesc="Development files for the pygobject bindings"
-
-  cd "${srcdir}/devel"
-  mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject}
-
-  mv include   "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-  mv gtk-doc   "$pkgdir/usr/share/"
-  mv xsl   "$pkgdir/usr/share/pygobject/"
+  mv devel/* "$pkgdir"
 }

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2012-10-15 Thread Allan McRae 
Date: Monday, October 15, 2012 @ 20:39:17
  Author: allan
Revision: 168791

upgpkg: pygobject2 2.28.6-7

python-3.3 rebuild

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-16 00:34:59 UTC (rev 168790)
+++ PKGBUILD2012-10-16 00:39:17 UTC (rev 168791)
@@ -4,7 +4,7 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url="http://www.pygtk.org/";
 license=('LGPL')

[arch-commits] Commit in pygobject2/trunk (PKGBUILD python2-fix-type.patch)

2012-05-06 Thread Gaetan Bisson 
Date: Sunday, May 6, 2012 @ 18:43:56
  Author: bisson
Revision: 158677

fix FS#29782

Added:
  pygobject2/trunk/python2-fix-type.patch
Modified:
  pygobject2/trunk/PKGBUILD

+
 PKGBUILD   |5 +++-
 python2-fix-type.patch |   50 +++
 2 files changed, 54 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-06 22:35:08 UTC (rev 158676)
+++ PKGBUILD2012-05-06 22:43:56 UTC (rev 158677)
@@ -4,16 +4,18 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://www.pygtk.org/";
 license=('LGPL')
 makedepends=('python' 'python2')
 
source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
+python2-fix-type.patch
 python3-fix-build.patch
 python3-fix-maketrans.patch)
 options=('!libtool')
 sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
+'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea'
 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
 '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
 
@@ -32,6 +34,7 @@
   (
 cd "pygobject-${pkgver}"
 #patches available in 2.28 branch but unreleased.
+patch -Np1 -i "${srcdir}/python2-fix-type.patch"
 patch -Np1 -i "${srcdir}/python3-fix-build.patch"
 patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
 

Added: python2-fix-type.patch
===
--- python2-fix-type.patch  (rev 0)
+++ python2-fix-type.patch  2012-05-06 22:43:56 UTC (rev 158677)
@@ -0,0 +1,50 @@
+From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie 
+Date: Mon, 12 Mar 2012 16:44:14 -0400
+Subject: gio-types.defs: change some enums to flags
+
+These flags types were originally incorrectly handled in glib as being
+enums.  That bug was fixed, but they're still enums here, leading to
+warnings about the mismatch.
+
+Change them to flags.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668522
+---
+ gio/gio-types.defs |6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gio-types.defs b/gio/gio-types.defs
+index 331e0bc..7eee5c8 100644
+--- a/gio/gio-types.defs
 b/gio/gio-types.defs
+@@ -526,7 +526,7 @@
+   )
+ )
+ 
+-(define-enum MountMountFlags
++(define-flags MountMountFlags
+   (in-module "gio")
+   (c-name "GMountMountFlags")
+   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
+@@ -545,7 +545,7 @@
+   )
+ )
+ 
+-(define-enum DriveStartFlags
++(define-flags DriveStartFlags
+   (in-module "gio")
+   (c-name "GDriveStartFlags")
+   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
+@@ -770,7 +770,7 @@
+   )
+ )
+ 
+-(define-enum SocketMsgFlags
++(define-flags SocketMsgFlags
+   (in-module "gio")
+   (c-name "GSocketMsgFlags")
+   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
+-- 
+1.7.9.1
+

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2012-04-25 Thread Allan McRae 
Date: Wednesday, April 25, 2012 @ 06:24:04
  Author: allan
Revision: 157174

upgpkg: pygobject2 2.28.6-5

libffi rebuild

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-25 10:19:14 UTC (rev 157173)
+++ PKGBUILD2012-04-25 10:24:04 UTC (rev 157174)
@@ -4,7 +4,7 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.pygtk.org/";
 license=('LGPL')

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2011-09-28 Thread Ionut Biru 
Date: Wednesday, September 28, 2011 @ 06:53:53
  Author: ibiru
Revision: 138803

fix dependencies

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-28 10:31:26 UTC (rev 138802)
+++ PKGBUILD2011-09-28 10:53:53 UTC (rev 138803)
@@ -4,11 +4,10 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.pygtk.org/";
 license=('LGPL')
-depends=('glib2' 'pygobject2-devel')
 makedepends=('python' 'python2')
 
source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
 python3-fix-build.patch
@@ -43,7 +42,7 @@
 
 package_python-gobject2() {
   pkgdesc="Python 3 bindings for GObject2"
-  depends+=('python')
+  depends=('glib2' 'pygobject2-devel' 'python')
   replaces=('py3gobject')
   provides=("py3gobject=$pkgver")
 
@@ -56,7 +55,7 @@
 
 package_python2-gobject2() {
   pkgdesc="Python 2 bindings for GObject2"
-  depends+=('python2')
+  depends=('glib2' 'pygobject2-devel' 'python2')
   replaces=('pygobject')
   provides=("pygobject=$pkgver")

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2011-09-16 Thread Ionut Biru 
Date: Friday, September 16, 2011 @ 05:07:57
  Author: ibiru
Revision: 138098

drop replaces/provides for pygobject2-devel, codegen has a sense only for 
python2 port

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |   15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-16 08:59:15 UTC (rev 138097)
+++ PKGBUILD2011-09-16 09:07:57 UTC (rev 138098)
@@ -4,12 +4,12 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.pygtk.org/";
 license=('LGPL')
 depends=('glib2' 'pygobject2-devel')
-makedepends=(python python2 'namcap')
+makedepends=('python' 'python2')
 
source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
 python3-fix-build.patch
 python3-fix-maketrans.patch)
@@ -43,6 +43,7 @@
 
 package_python-gobject2() {
   pkgdesc="Python 3 bindings for GObject2"
+  depends+=('python')
   replaces=('py3gobject')
   provides=("py3gobject=$pkgver")
 
@@ -55,6 +56,7 @@
 
 package_python2-gobject2() {
   pkgdesc="Python 2 bindings for GObject2"
+  depends+=('python2')
   replaces=('pygobject')
   provides=("pygobject=$pkgver")
 
@@ -65,23 +67,18 @@
 xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
 
   # Split devel stuff
-  mv 
"$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
 \
+  mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \
 "$srcdir/devel/"
 }
 
 package_pygobject2-devel() {
   pkgdesc="Development files for the pygobject bindings"
-  depends=('python2')
-  replaces=('pygobject-devel')
-  provides=('pygobject-devel')
 
   cd "${srcdir}/devel"
-  mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject/2.0}
+  mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject}
 
-  mv bin   "$pkgdir/usr/"
   mv include   "$pkgdir/usr/"
   mv pkgconfig "$pkgdir/usr/lib/"
   mv gtk-doc   "$pkgdir/usr/share/"
-  mv codegen   "$pkgdir/usr/share/pygobject/2.0/"
   mv xsl   "$pkgdir/usr/share/pygobject/"
 }

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2011-09-02 Thread Ionut Biru 
Date: Friday, September 2, 2011 @ 14:41:04
  Author: ibiru
Revision: 136912

disable g-i, as it conflicts with pygobject3

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |   18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-02 18:22:52 UTC (rev 136911)
+++ PKGBUILD2011-09-02 18:41:04 UTC (rev 136912)
@@ -4,12 +4,12 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.pygtk.org/";
 license=('LGPL')
-depends=('glib2' 'gobject-introspection')
-makedepends=(python python2 python-cairo python2-cairo)
+depends=('glib2' 'pygobject2-devel')
+makedepends=(python python2 'namcap')
 
source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
 python3-fix-build.patch
 python3-fix-maketrans.patch)
@@ -26,7 +26,7 @@
   (
 cd python2-build
 export PYTHON=/usr/bin/python2
-./configure --prefix=/usr
+./configure --prefix=/usr --disable-introspection
 make
   )
 
@@ -36,14 +36,13 @@
 patch -Np1 -i "${srcdir}/python3-fix-build.patch"
 patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
 
-./configure --prefix=/usr
+./configure --prefix=/usr --disable-introspection
 make
   )
 }
 
 package_python-gobject2() {
   pkgdesc="Python 3 bindings for GObject2"
-  depends+=('python' 'python-cairo' 'pygobject2-devel')
   replaces=('py3gobject')
   provides=("py3gobject=$pkgver")
 
@@ -56,7 +55,6 @@
 
 package_python2-gobject2() {
   pkgdesc="Python 2 bindings for GObject2"
-  depends+=('python2' 'python2-cairo' 'pygobject2-devel')
   replaces=('pygobject')
   provides=("pygobject=$pkgver")
 
@@ -73,9 +71,9 @@
 
 package_pygobject2-devel() {
   pkgdesc="Development files for the pygobject bindings"
-  depends=(python2)
-  replaces=pygobject-devel
-  provides=pygobject-devel
+  depends=('python2')
+  replaces=('pygobject-devel')
+  provides=('pygobject-devel')
 
   cd "${srcdir}/devel"
   mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject/2.0}

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2011-09-02 Thread Ionut Biru 
Date: Friday, September 2, 2011 @ 07:42:42
  Author: ibiru
Revision: 136845

add version to provide

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-02 11:31:09 UTC (rev 136844)
+++ PKGBUILD2011-09-02 11:42:42 UTC (rev 136845)
@@ -44,8 +44,8 @@
 package_python-gobject2() {
   pkgdesc="Python 3 bindings for GObject2"
   depends+=('python' 'python-cairo' 'pygobject2-devel')
-  replaces=py3gobject
-  provides=py3gobject
+  replaces=('py3gobject')
+  provides=("py3gobject=$pkgver")
 
   cd "${srcdir}/pygobject-${pkgver}"
   make DESTDIR="${pkgdir}" install
@@ -57,8 +57,8 @@
 package_python2-gobject2() {
   pkgdesc="Python 2 bindings for GObject2"
   depends+=('python2' 'python2-cairo' 'pygobject2-devel')
-  replaces=pygobject
-  provides=pygobject
+  replaces=('pygobject')
+  provides=("pygobject=$pkgver")
 
   cd "${srcdir}/python2-build"
   make DESTDIR="${pkgdir}" install

[arch-commits] Commit in pygobject2/trunk (PKGBUILD)

2011-09-02 Thread Ionut Biru 
Date: Friday, September 2, 2011 @ 07:28:12
  Author: ibiru
Revision: 136843

rename pygobject to python2-gobject2 and py3gobject to python-gobject

Modified:
  pygobject2/trunk/PKGBUILD

--+
 PKGBUILD |   48 +++-
 1 file changed, 27 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-02 09:52:32 UTC (rev 136842)
+++ PKGBUILD2011-09-02 11:28:12 UTC (rev 136843)
@@ -1,26 +1,26 @@
 # $Id$
 # Maintainer: Jan de Groot 
 
-pkgbase=pygobject
-pkgname=(pygobject py3gobject pygobject-devel)
+pkgbase=pygobject2
+pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
 pkgrel=1
 arch=('i686' 'x86_64')
+url="http://www.pygtk.org/";
 license=('LGPL')
 depends=('glib2' 'gobject-introspection')
 makedepends=(python python2 python-cairo python2-cairo)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
 python3-fix-build.patch
 python3-fix-maketrans.patch)
 options=('!libtool')
-url="http://www.pygtk.org/";
 sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
 '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
 
 build() {
   cd "${srcdir}"
-  cp -a "${pkgbase}-${pkgver}" python2-build
+  cp -a "pygobject-${pkgver}" python2-build
   mkdir devel
 
   (
@@ -31,7 +31,7 @@
   )
 
   (
-cd "${pkgbase}-${pkgver}"
+cd "pygobject-${pkgver}"
 #patches available in 2.28 branch but unreleased.
 patch -Np1 -i "${srcdir}/python3-fix-build.patch"
 patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
@@ -41,10 +41,25 @@
   )
 }
 
-package_pygobject() {
-  pkgdesc="Python 2 bindings for GObject"
-  depends+=('python2' 'python2-cairo' 'pygobject-devel')
+package_python-gobject2() {
+  pkgdesc="Python 3 bindings for GObject2"
+  depends+=('python' 'python-cairo' 'pygobject2-devel')
+  replaces=py3gobject
+  provides=py3gobject
 
+  cd "${srcdir}/pygobject-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  # Delete devel stuff
+  rm -r 
"$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
+}
+
+package_python2-gobject2() {
+  pkgdesc="Python 2 bindings for GObject2"
+  depends+=('python2' 'python2-cairo' 'pygobject2-devel')
+  replaces=pygobject
+  provides=pygobject
+
   cd "${srcdir}/python2-build"
   make DESTDIR="${pkgdir}" install
 
@@ -56,20 +71,11 @@
 "$srcdir/devel/"
 }
 
-package_py3gobject() {
-  pkgdesc="Python 3 bindings for GObject"
-  depends+=('python' 'python-cairo' 'pygobject-devel')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # Delete devel stuff
-  rm -r 
"$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
-}
-
-package_pygobject-devel() {
+package_pygobject2-devel() {
   pkgdesc="Development files for the pygobject bindings"
   depends=(python2)
+  replaces=pygobject-devel
+  provides=pygobject-devel
 
   cd "${srcdir}/devel"
   mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject/2.0}