From 4f8061980dba882945f0d6a22c467df253b94df5 Mon Sep 17 00:00:00 2001 From: piernov Date: Mon, 26 Mar 2012 02:43:45 +0200 Subject: gtkspell 2.0.16-2 ajout support gtk3 --- gtkspell/.footprint.i686 | 9 +++ gtkspell/.footprint.x86_64 | 9 +++ gtkspell/.md5sum.i686 | 1 + gtkspell/.md5sum.x86_64 | 1 + gtkspell/Pkgfile | 32 ++++++---- gtkspell/gtk3_support.patch | 142 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 184 insertions(+), 10 deletions(-) create mode 100644 gtkspell/gtk3_support.patch diff --git a/gtkspell/.footprint.i686 b/gtkspell/.footprint.i686 index f822fb139..369f1aa15 100644 --- a/gtkspell/.footprint.i686 +++ b/gtkspell/.footprint.i686 @@ -3,7 +3,15 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/gtkspell-2.0/ drwxr-xr-x root/root usr/include/gtkspell-2.0/gtkspell/ -rw-r--r-- root/root usr/include/gtkspell-2.0/gtkspell/gtkspell.h +drwxr-xr-x root/root usr/include/gtkspell-3.0/ +drwxr-xr-x root/root usr/include/gtkspell-3.0/gtkspell/ +-rw-r--r-- root/root usr/include/gtkspell-3.0/gtkspell/gtkspell.h drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libgtkspell-3.a +-rwxr-xr-x root/root usr/lib/libgtkspell-3.la +lrwxrwxrwx root/root usr/lib/libgtkspell-3.so -> libgtkspell-3.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libgtkspell-3.so.0 -> libgtkspell-3.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libgtkspell-3.so.0.0.0 -rw-r--r-- root/root usr/lib/libgtkspell.a -rwxr-xr-x root/root usr/lib/libgtkspell.la lrwxrwxrwx root/root usr/lib/libgtkspell.so -> libgtkspell.so.0.0.0 @@ -11,6 +19,7 @@ lrwxrwxrwx root/root usr/lib/libgtkspell.so.0 -> libgtkspell.so.0.0.0 -rwxr-xr-x root/root usr/lib/libgtkspell.so.0.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gtkspell-2.0.pc +-rw-r--r-- root/root usr/lib/pkgconfig/gtkspell-3.0.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/locale/ drwxr-xr-x root/root usr/share/locale/fr/ diff --git a/gtkspell/.footprint.x86_64 b/gtkspell/.footprint.x86_64 index f822fb139..369f1aa15 100644 --- a/gtkspell/.footprint.x86_64 +++ b/gtkspell/.footprint.x86_64 @@ -3,7 +3,15 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/gtkspell-2.0/ drwxr-xr-x root/root usr/include/gtkspell-2.0/gtkspell/ -rw-r--r-- root/root usr/include/gtkspell-2.0/gtkspell/gtkspell.h +drwxr-xr-x root/root usr/include/gtkspell-3.0/ +drwxr-xr-x root/root usr/include/gtkspell-3.0/gtkspell/ +-rw-r--r-- root/root usr/include/gtkspell-3.0/gtkspell/gtkspell.h drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libgtkspell-3.a +-rwxr-xr-x root/root usr/lib/libgtkspell-3.la +lrwxrwxrwx root/root usr/lib/libgtkspell-3.so -> libgtkspell-3.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libgtkspell-3.so.0 -> libgtkspell-3.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libgtkspell-3.so.0.0.0 -rw-r--r-- root/root usr/lib/libgtkspell.a -rwxr-xr-x root/root usr/lib/libgtkspell.la lrwxrwxrwx root/root usr/lib/libgtkspell.so -> libgtkspell.so.0.0.0 @@ -11,6 +19,7 @@ lrwxrwxrwx root/root usr/lib/libgtkspell.so.0 -> libgtkspell.so.0.0.0 -rwxr-xr-x root/root usr/lib/libgtkspell.so.0.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gtkspell-2.0.pc +-rw-r--r-- root/root usr/lib/pkgconfig/gtkspell-3.0.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/locale/ drwxr-xr-x root/root usr/share/locale/fr/ diff --git a/gtkspell/.md5sum.i686 b/gtkspell/.md5sum.i686 index 5ade0e2f0..deec53542 100644 --- a/gtkspell/.md5sum.i686 +++ b/gtkspell/.md5sum.i686 @@ -1 +1,2 @@ +7d5621f609ac90121adefc150ae374a1 gtk3_support.patch f75dcc9338f182c571b321d37c606a94 gtkspell-2.0.16.tar.gz diff --git a/gtkspell/.md5sum.x86_64 b/gtkspell/.md5sum.x86_64 index 5ade0e2f0..deec53542 100644 --- a/gtkspell/.md5sum.x86_64 +++ b/gtkspell/.md5sum.x86_64 @@ -1 +1,2 @@ +7d5621f609ac90121adefc150ae374a1 gtk3_support.patch f75dcc9338f182c571b321d37c606a94 gtkspell-2.0.16.tar.gz diff --git a/gtkspell/Pkgfile b/gtkspell/Pkgfile index 98908274b..0755bea1c 100644 --- a/gtkspell/Pkgfile +++ b/gtkspell/Pkgfile @@ -2,19 +2,31 @@ # URL: http://gtkspell.sourceforge.net/ # Packager: thierryn1 at hispeed dot ch # Maintainer: NuTyX core team -# Depends on: gtk, aspell, enchant, xorg-libxcursor, xorg-libxdamage, xorg-libxrandr, xorg-libxinerama -# Run on: gtk,aspell,enchant +# Depends on: gtk, gtk3, aspell, enchant, xorg-libxcursor, xorg-libxdamage, xorg-libxrandr, xorg-libxinerama +# Run on: gtk,gtk3,aspell,enchant name=gtkspell version=2.0.16 -release=1 -source=(http://gtkspell.sourceforge.net/download/$name-$version.tar.gz) +release=2 +source=(http://gtkspell.sourceforge.net/download/$name-$version.tar.gz + gtk3_support.patch) build() { -cd $name-$version -./configure --prefix=/usr -make -make DESTDIR=$PKG install -rm -rf $PKG/usr/share/gtk-doc + cd $name-$version + + patch -p1 < ../gtk3_support.patch + autoreconf -fi + + ./configure --prefix=/usr \ + --with-gtk=2 + make + make DESTDIR=$PKG install + + make clean + ./configure --prefix=/usr \ + --with-gtk=3 + make + make DESTDIR=$PKG install + + rm -rf $PKG/usr/share/gtk-doc } - diff --git a/gtkspell/gtk3_support.patch b/gtkspell/gtk3_support.patch new file mode 100644 index 000000000..4f3f85a83 --- /dev/null +++ b/gtkspell/gtk3_support.patch @@ -0,0 +1,142 @@ +=== modified file 'Makefile.am' +--- old/Makefile.am 2010-01-08 22:13:05 +0000 ++++ new/Makefile.am 2011-07-23 21:39:04 +0000 +@@ -1,8 +1,14 @@ + SUBDIRS=gtkspell examples docs po + + pkgconfigdir=$(libdir)/pkgconfig ++ ++if USE_GTK3 ++pkgconfig_DATA=gtkspell-3.0.pc ++DISTCLEANFILES=gtkspell-3.0.pc ++else + pkgconfig_DATA=gtkspell-2.0.pc + DISTCLEANFILES=gtkspell-2.0.pc ++endif + + dist-hook: + $(MAKE) -C "$(srcdir)/po" "$(GETTEXT_PACKAGE).pot" + +=== modified file 'configure.ac' +--- old/configure.ac 2010-01-08 22:13:05 +0000 ++++ new/configure.ac 2011-07-24 00:34:17 +0000 +@@ -15,11 +15,32 @@ + SPELLER_LIB=-lenchant + + AC_SUBST(SPELLER_LIB) +-GTKSPELL_PACKAGES=gtk+-2.0 ++ ++AC_ARG_WITH([gtk], ++ [AS_HELP_STRING([--with-gtk], ++ [Which version of gtk to use @<:@default=2@:>@])], ++ [], ++ [with_gtk=3]) ++AS_IF([test "x$with_gtk" = x3], ++ [PKG_CHECK_MODULES(GTKSPELL, gtk+-3.0 ++ enchant >= 0.4.0) ++ GTKSPELL_PACKAGES=gtk+-3.0 ++ AC_SUBST(GTKSPELL_CFLAGS) ++ AC_SUBST(GTKSPELL_LIBS) ++ AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) ++ ], ++ [test "x$with_gtk" = x2], ++ [PKG_CHECK_MODULES(GTKSPELL, gtk+-2.0 ++ enchant >= 0.4.0) ++ GTKSPELL_PACKAGES=gtk+-2.0 ++ AC_SUBST(GTKSPELL_CFLAGS) ++ AC_SUBST(GTKSPELL_LIBS) ++ ], ++ [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] ++) ++AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) ++ + AC_SUBST(GTKSPELL_PACKAGES) +-PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES enchant >= 0.4.0 ) +-AC_SUBST(GTKSPELL_CFLAGS) +-AC_SUBST(GTKSPELL_LIBS) + + # check Pango version so we can use PANGO_UNDERLINE_ERROR when available: + PKG_CHECK_MODULES(PANGO, [pango >= 1.3.5], +@@ -90,7 +111,7 @@ + + dnl AM_MAINTAINER_MODE + +-AC_CONFIG_FILES(Makefile gtkspell/Makefile examples/Makefile gtkspell-2.0.pc gtkspell.spec docs/Makefile po/Makefile.in) ++AC_CONFIG_FILES(Makefile gtkspell/Makefile examples/Makefile gtkspell-2.0.pc gtkspell-3.0.pc gtkspell.spec docs/Makefile po/Makefile.in) + + GTK_DOC_CHECK(1.0) + + +=== modified file 'examples/Makefile.am' +--- old/examples/Makefile.am 2005-09-06 13:00:45 +0000 ++++ new/examples/Makefile.am 2011-07-23 21:39:04 +0000 +@@ -1,6 +1,10 @@ + noinst_PROGRAMS = simple advanced + AM_CFLAGS = @GTKSPELL_CFLAGS@ -I$(top_builddir) + INCLUDES = -I$(top_srcdir) ++if USE_GTK3 ++LDADD = @GTKSPELL_LIBS@ $(top_builddir)/gtkspell/libgtkspell-3.la ++else + LDADD = @GTKSPELL_LIBS@ $(top_builddir)/gtkspell/libgtkspell.la ++endif + simple_SOURCES = simple.c + advanced_SOURCES = advanced.c + +=== modified file 'gtkspell/Makefile.am' +--- old/gtkspell/Makefile.am 2005-09-06 13:00:45 +0000 ++++ new/gtkspell/Makefile.am 2011-07-23 21:39:04 +0000 +@@ -1,6 +1,20 @@ +-lib_LTLIBRARIES=libgtkspell.la ++if USE_GTK3 ++VER=3 ++lib_LTLIBRARIES = libgtkspell-3.la ++else ++VER= ++lib_LTLIBRARIES = libgtkspell.la ++endif ++ + AM_CFLAGS=@GTKSPELL_CFLAGS@ -DG_LOG_DOMAIN=\"gtkspell\" -DLOCALEDIR=\""$(datadir)/locale"\" ++if USE_GTK3 ++libgtkspell_3_la_LIBADD=@GTKSPELL_LIBS@ @SPELLER_LIB@ ++libgtkspell_3_la_includedir=$(includedir)/gtkspell-3.0/gtkspell ++libgtkspell_3_la_include_HEADERS=gtkspell.h ++libgtkspell_3_la_SOURCES=gtkspell.c deprecated.c gtkspell.h ++else + libgtkspell_la_LIBADD=@GTKSPELL_LIBS@ @SPELLER_LIB@ + libgtkspell_la_includedir=$(includedir)/gtkspell-2.0/gtkspell + libgtkspell_la_include_HEADERS=gtkspell.h + libgtkspell_la_SOURCES=gtkspell.c deprecated.c gtkspell.h ++endif + +=== modified file 'gtkspell/gtkspell.c' +--- old/gtkspell/gtkspell.c 2010-01-08 22:13:05 +0000 ++++ new/gtkspell/gtkspell.c 2011-07-23 21:39:04 +0000 +@@ -310,7 +310,8 @@ + + get_word_extents_from_mark(spell->buffer, &start, &end, spell->mark_click); + oldword = gtk_text_buffer_get_text(spell->buffer, &start, &end, FALSE); +- newword = gtk_label_get_text(GTK_LABEL(GTK_BIN(menuitem)->child)); ++ newword = ++ gtk_label_get_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem)))); + + if (debug) { + g_print("old word: '%s'\n", oldword); + +=== added file 'gtkspell-3.0.pc.in' +--- old/gtkspell-3.0.pc.in 1970-01-01 00:00:00 +0000 ++++ new/gtkspell-3.0.pc.in 2011-07-23 21:39:04 +0000 +@@ -0,0 +1,13 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: GTKSpell ++Description: GTK spelling library ++Version: @VERSION@ ++Requires: @GTKSPELL_PACKAGES@ ++Libs: -L${libdir} -lgtkspell-3 ++Libs.private: @SPELLER_LIB@ ++Cflags: -I${includedir}/gtkspell-3.0 ++ + -- cgit v1.2.3-54-g00ecf