[arch-commits] Commit in gtk2/repos (3 files)
Date: Thursday, December 10, 2009 @ 16:58:56
Author: ibiru
Revision: 61065
Merged revisions 60611,61064 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gtk2/trunk
r60611 | jgc | 2009-12-05 18:14:39 +0200 (Sat, 05 Dec 2009) | 1 line
remove patch. This is applied upstream but still applies. Applying it has no
negative side-effects so no need for a rebuild
r61064 | ibiru | 2009-12-10 23:58:10 +0200 (Thu, 10 Dec 2009) | 2 lines
upgpkg: gtk2 2.18.5-1
new ver
Modified:
gtk2/repos/extra-i686/(properties)
gtk2/repos/extra-i686/PKGBUILD
Deleted:
gtk2/repos/extra-i686/libjpeg-7.patch
-+
PKGBUILD| 11 ---
libjpeg-7.patch | 11 ---
2 files changed, 4 insertions(+), 18 deletions(-)
Property changes on: gtk2/repos/extra-i686
___
Modified: svnmerge-integrated
- /gtk2/trunk:1-60297
+ /gtk2/trunk:1-61064
Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-10 21:58:10 UTC (rev 61064)
+++ extra-i686/PKGBUILD 2009-12-10 21:58:56 UTC (rev 61065)
@@ -2,14 +2,14 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=gtk2
-pkgver=2.18.4
+pkgver=2.18.5
pkgrel=1
pkgdesc=The GTK+ Toolkit (v2)
arch=(i686 x86_64)
url=http://www.gtk.org/;
install=gtk2.install
-depends=('atk=1.28.0' 'pango=1.26.0' 'libxcursor' 'libxinerama'
'libxrandr=1.3.0' \
- 'libxi=1.2.1' 'libcups=1.4.1-2' 'libxcomposite' 'libxdamage'
'heimdal=1.3.1' \
+depends=('atk=1.28.0' 'pango=1.26.1' 'libxcursor' 'libxinerama'
'libxrandr=1.3.0' \
+ 'libxi=1.2.1' 'libcups=1.4.2' 'libxcomposite' 'libxdamage'
'heimdal=1.3.1' \
'gnutls=2.8.3' 'shared-mime-info')
makedepends=('pkgconfig' 'gtk-doc')
replaces=('gtkprint-cups' 'gail')
@@ -19,15 +19,12 @@
backup=(etc/gtk-2.0/gtkrc)
license=('LGPL')
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.18/gtk+-${pkgver}.tar.bz2
-libjpeg-7.patch
xid-collision-debug.patch)
-sha256sums=('67a83c6b2e774bc20b2a0582fb7fad7b1e8d5e04ede39f299d614e365756d2a7'
-'67de89f864a8d10e617a9600025d5bd932ac22adca4cda314d470a2d72e0196e'
+sha256sums=('4986365bce2f164edae10be20a4d417eadca9534eedfd9e2176a0c45334b7bf4'
'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
build() {
cd ${srcdir}/gtk+-${pkgver}
- patch -Np1 -i ${srcdir}/libjpeg-7.patch || return 1
patch -Np1 -i ${srcdir}/xid-collision-debug.patch || return 1
CXX=/bin/false ./configure --prefix=/usr --sysconfdir=/etc \
Deleted: extra-i686/libjpeg-7.patch
===
--- extra-i686/libjpeg-7.patch 2009-12-10 21:58:10 UTC (rev 61064)
+++ extra-i686/libjpeg-7.patch 2009-12-10 21:58:56 UTC (rev 61065)
@@ -1,11 +0,0 @@
gtk+-2.18.2/gdk-pixbuf/io-jpeg.c.orig 2009-10-09 09:53:34.0
+0200
-+++ gtk+-2.18.2/gdk-pixbuf/io-jpeg.c 2009-10-09 09:54:23.0 +0200
-@@ -920,6 +920,8 @@
- return FALSE;
- }
- }
-+
-+ cinfo-scale_num = 1;
-
- for (cinfo-scale_denom = 2; cinfo-scale_denom = 8;
cinfo-scale_denom *= 2) {
- jpeg_calc_output_dimensions (cinfo);
[arch-commits] Commit in gtk2/repos (3 files)
Date: Sunday, November 8, 2009 @ 16:19:27
Author: jgc
Revision: 58513
Merged revisions 58508 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gtk2/trunk
r58508 | jgc | 2009-11-08 22:13:50 +0100 (Sun, 08 Nov 2009) | 1 line
Remove xid collision warnings (FS#17020)
Added:
gtk2/repos/extra-x86_64/xid-collision-debug.patch
(from rev 58508, gtk2/trunk/xid-collision-debug.patch)
Modified:
gtk2/repos/extra-x86_64/ (properties)
gtk2/repos/extra-x86_64/PKGBUILD
---+
PKGBUILD | 10 ++
xid-collision-debug.patch | 15 +++
2 files changed, 21 insertions(+), 4 deletions(-)
Property changes on: gtk2/repos/extra-x86_64
___
Modified: svnmerge-integrated
- /gtk2/trunk:1-56031
+ /gtk2/trunk:1-58512
Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2009-11-08 21:15:37 UTC (rev 58512)
+++ extra-x86_64/PKGBUILD 2009-11-08 21:19:27 UTC (rev 58513)
@@ -3,7 +3,7 @@
pkgname=gtk2
pkgver=2.18.3
-pkgrel=1
+pkgrel=2
pkgdesc=The GTK+ Toolkit (v2)
arch=(i686 x86_64)
url=http://www.gtk.org/;
@@ -17,15 +17,17 @@
backup=(etc/gtk-2.0/gtkrc)
license=('LGPL')
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.18/gtk+-${pkgver}.tar.bz2
-libjpeg-7.patch)
+libjpeg-7.patch
+xid-collision-debug.patch)
sha256sums=('1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf'
-'67de89f864a8d10e617a9600025d5bd932ac22adca4cda314d470a2d72e0196e')
+'67de89f864a8d10e617a9600025d5bd932ac22adca4cda314d470a2d72e0196e'
+'d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
build() {
cd ${srcdir}/gtk+-${pkgver}
patch -Np1 -i ${srcdir}/libjpeg-7.patch || return 1
+ patch -Np1 -i ${srcdir}/xid-collision-debug.patch || return 1
- autoreconf || return 1
CXX=/bin/false ./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --with-xinput=yes \
--without-libjasper \
Copied: gtk2/repos/extra-x86_64/xid-collision-debug.patch (from rev 58508,
gtk2/trunk/xid-collision-debug.patch)
===
--- extra-x86_64/xid-collision-debug.patch (rev 0)
+++ extra-x86_64/xid-collision-debug.patch 2009-11-08 21:19:27 UTC (rev
58513)
@@ -0,0 +1,15 @@
+--- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.0 +0200
gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.0 +0200
+@@ -56,10 +56,10 @@
+ if (!display_x11-xid_ht)
+ display_x11-xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
+ (GEqualFunc) gdk_xid_equal);
+-
++/*
+ if (g_hash_table_lookup (display_x11-xid_ht, xid))
+ g_warning (XID collision, trouble ahead);
+-
++*/
+ g_hash_table_insert (display_x11-xid_ht, xid, data);
+ }
+
[arch-commits] Commit in gtk2/repos (3 files)
Date: Sunday, November 8, 2009 @ 16:24:09
Author: jgc
Revision: 58516
Merged revisions 58508 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gtk2/trunk
r58508 | jgc | 2009-11-08 22:13:50 +0100 (Sun, 08 Nov 2009) | 1 line
Remove xid collision warnings (FS#17020)
Added:
gtk2/repos/extra-i686/xid-collision-debug.patch
(from rev 58508, gtk2/trunk/xid-collision-debug.patch)
Modified:
gtk2/repos/extra-i686/(properties)
gtk2/repos/extra-i686/PKGBUILD
---+
PKGBUILD | 10 ++
xid-collision-debug.patch | 15 +++
2 files changed, 21 insertions(+), 4 deletions(-)
Property changes on: gtk2/repos/extra-i686
___
Modified: svnmerge-integrated
- /gtk2/trunk:1-56355
+ /gtk2/trunk:1-58515
Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-11-08 21:22:51 UTC (rev 58515)
+++ extra-i686/PKGBUILD 2009-11-08 21:24:09 UTC (rev 58516)
@@ -3,7 +3,7 @@
pkgname=gtk2
pkgver=2.18.3
-pkgrel=1
+pkgrel=2
pkgdesc=The GTK+ Toolkit (v2)
arch=(i686 x86_64)
url=http://www.gtk.org/;
@@ -17,15 +17,17 @@
backup=(etc/gtk-2.0/gtkrc)
license=('LGPL')
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.18/gtk+-${pkgver}.tar.bz2
-libjpeg-7.patch)
+libjpeg-7.patch
+xid-collision-debug.patch)
sha256sums=('1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf'
-'67de89f864a8d10e617a9600025d5bd932ac22adca4cda314d470a2d72e0196e')
+'67de89f864a8d10e617a9600025d5bd932ac22adca4cda314d470a2d72e0196e'
+'d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
build() {
cd ${srcdir}/gtk+-${pkgver}
patch -Np1 -i ${srcdir}/libjpeg-7.patch || return 1
+ patch -Np1 -i ${srcdir}/xid-collision-debug.patch || return 1
- autoreconf || return 1
CXX=/bin/false ./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --with-xinput=yes \
--without-libjasper \
Copied: gtk2/repos/extra-i686/xid-collision-debug.patch (from rev 58508,
gtk2/trunk/xid-collision-debug.patch)
===
--- extra-i686/xid-collision-debug.patch(rev 0)
+++ extra-i686/xid-collision-debug.patch2009-11-08 21:24:09 UTC (rev
58516)
@@ -0,0 +1,15 @@
+--- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.0 +0200
gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.0 +0200
+@@ -56,10 +56,10 @@
+ if (!display_x11-xid_ht)
+ display_x11-xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
+ (GEqualFunc) gdk_xid_equal);
+-
++/*
+ if (g_hash_table_lookup (display_x11-xid_ht, xid))
+ g_warning (XID collision, trouble ahead);
+-
++*/
+ g_hash_table_insert (display_x11-xid_ht, xid, data);
+ }
+
