[arch-commits] Commit in gtk2+extra/trunk (PKGBUILD build-fix.patch)
Sergej Pupykin
spupykin at archlinux.org
Mon Nov 28 10:51:30 UTC 2016
Date: Monday, November 28, 2016 @ 10:51:30
Author: spupykin
Revision: 197100
upgpkg: gtk2+extra 3.3.3-1
upd
Modified:
gtk2+extra/trunk/PKGBUILD
Deleted:
gtk2+extra/trunk/build-fix.patch
-----------------+
PKGBUILD | 15 +++------
build-fix.patch | 85 ------------------------------------------------------
2 files changed, 6 insertions(+), 94 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-11-28 10:51:25 UTC (rev 197099)
+++ PKGBUILD 2016-11-28 10:51:30 UTC (rev 197100)
@@ -3,26 +3,23 @@
# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
pkgname=gtk2+extra
-pkgver=2.1.2
-pkgrel=3
+pkgver=3.3.3
+pkgrel=1
pkgdesc="GtkExtra is a useful set of widgets for creating GUI's for the Xwindows system using GTK+"
arch=(i686 x86_64)
url="http://gtkextra.sourceforge.net/"
depends=('gtk2')
license=('LGPL')
-source=(http://downloads.sourceforge.net/project/gtkextra/$pkgver/gtk%2Bextra-$pkgver.tar.gz
- build-fix.patch)
-md5sums=('10779394f39d39115fa3fd0f3dea4436'
- '114c10e7dc14dc78fc38189ee82fa225')
+source=(http://downloads.sourceforge.net/project/gtkextra/${pkgver%.*}/gtkextra-$pkgver.tar.gz)
+sha256sums=('7889f958ee9fb6bd564aa941891909c3af7a03b92e232c5a90bab0289407d884')
build() {
- cd "$srcdir"/gtk+extra-$pkgver
- patch -p1 <"$srcdir"/build-fix.patch
+ cd "$srcdir"/gtkextra-$pkgver
./configure --prefix=/usr
make
}
package() {
- cd "$srcdir"/gtk+extra-$pkgver
+ cd "$srcdir"/gtkextra-$pkgver
make DESTDIR="$pkgdir" install
}
Deleted: build-fix.patch
===================================================================
--- build-fix.patch 2016-11-28 10:51:25 UTC (rev 197099)
+++ build-fix.patch 2016-11-28 10:51:30 UTC (rev 197100)
@@ -1,85 +0,0 @@
-diff -ur gtk+extra-2.1.2/gtkextra/gtkextra-marshal.list gtk+extra-2.1.2.my/gtkextra/gtkextra-marshal.list
---- gtk+extra-2.1.2/gtkextra/gtkextra-marshal.list 2002-06-14 22:36:36.000000000 +0400
-+++ gtk+extra-2.1.2.my/gtkextra/gtkextra-marshal.list 2011-11-21 15:30:00.000000000 +0400
-@@ -10,6 +10,7 @@
- BOOL:BOXED
- BOOL:INT,INT
- VOID:INT
-+VOID:INT,BOXED
- VOID:INT,STRING
- VOID:BOXED
- VOID:VOID
-diff -ur gtk+extra-2.1.2/gtkextra/gtkitementry.c gtk+extra-2.1.2.my/gtkextra/gtkitementry.c
---- gtk+extra-2.1.2/gtkextra/gtkitementry.c 2010-03-13 08:49:00.000000000 +0300
-+++ gtk+extra-2.1.2.my/gtkextra/gtkitementry.c 2011-11-21 15:25:18.000000000 +0400
-@@ -131,7 +131,6 @@
- static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry,
- gboolean include_preedit);
- static void gtk_entry_queue_draw (GtkEntry *entry);
--static void gtk_entry_reset_im_context (GtkEntry *entry);
- static void gtk_entry_recompute (GtkEntry *entry);
- static void gtk_entry_get_cursor_locations (GtkEntry *entry,
- CursorType type,
-@@ -1755,16 +1754,6 @@
- }
-
- static void
--gtk_entry_reset_im_context (GtkEntry *entry)
--{
-- if (entry->need_im_reset)
-- {
-- entry->need_im_reset = 0;
-- gtk_im_context_reset (entry->im_context);
-- }
--}
--
--static void
- gtk_entry_get_cursor_locations (GtkEntry *entry,
- CursorType type,
- gint *strong_x,
-diff -ur gtk+extra-2.1.2/gtkextra/Makefile.am gtk+extra-2.1.2.my/gtkextra/Makefile.am
---- gtk+extra-2.1.2/gtkextra/Makefile.am 2005-06-16 02:54:34.000000000 +0400
-+++ gtk+extra-2.1.2.my/gtkextra/Makefile.am 2011-11-21 15:25:18.000000000 +0400
-@@ -197,13 +197,13 @@
- $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers}
-
- $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list
-- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
-- && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
-- || ( rm -f gtkextra-marshal.tmp && exit 1 )
-+ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
-+ && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
-+ || ( rm -f gtkextra-marshal.tmp && exit 1 )
- $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h
-- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
-- && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
-- || ( rm -f gtkextra-marshal.tmp && exit 1 )
-+ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
-+ && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
-+ || ( rm -f gtkextra-marshal.tmp && exit 1 )
-
-
- $(srcdir)/gtkextratypebuiltins.h: $(gtkextra_public_h_sources)
-diff -ur gtk+extra-2.1.2/gtkextra/Makefile.in gtk+extra-2.1.2.my/gtkextra/Makefile.in
---- gtk+extra-2.1.2/gtkextra/Makefile.in 2010-03-21 03:05:56.000000000 +0300
-+++ gtk+extra-2.1.2.my/gtkextra/Makefile.in 2011-11-21 15:25:18.000000000 +0400
-@@ -1028,13 +1028,13 @@
- $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers}
-
- $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list
-- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
-- && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
-- || ( rm -f gtkextra-marshal.tmp && exit 1 )
-+ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
-+ && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
-+ || ( rm -f gtkextra-marshal.tmp && exit 1 )
- $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h
-- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
-- && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
-- || ( rm -f gtkextra-marshal.tmp && exit 1 )
-+ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
-+ && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
-+ || ( rm -f gtkextra-marshal.tmp && exit 1 )
-
- $(srcdir)/gtkextratypebuiltins.h: $(gtkextra_public_h_sources)
- ( cd $(srcdir) && glib-mkenums \
More information about the arch-commits
mailing list