[arch-commits] Commit in gnome-hearts/repos (6 files)

Balló György bgyorgy at archlinux.org
Fri Jan 20 23:09:35 UTC 2017


    Date: Friday, January 20, 2017 @ 23:09:35
  Author: bgyorgy
Revision: 208166

archrelease: copy trunk to community-i686, community-x86_64

Added:
  gnome-hearts/repos/community-i686/PKGBUILD
    (from rev 208165, gnome-hearts/trunk/PKGBUILD)
  gnome-hearts/repos/community-i686/drop-libgnomeui.patch
    (from rev 208165, gnome-hearts/trunk/drop-libgnomeui.patch)
  gnome-hearts/repos/community-x86_64/PKGBUILD
    (from rev 208165, gnome-hearts/trunk/PKGBUILD)
  gnome-hearts/repos/community-x86_64/drop-libgnomeui.patch
    (from rev 208165, gnome-hearts/trunk/drop-libgnomeui.patch)
Deleted:
  gnome-hearts/repos/community-i686/PKGBUILD
  gnome-hearts/repos/community-x86_64/PKGBUILD

----------------------------------------+
 /PKGBUILD                              |   82 +++++++++++++++++++++++++++++++
 community-i686/PKGBUILD                |   31 -----------
 community-i686/drop-libgnomeui.patch   |   64 ++++++++++++++++++++++++
 community-x86_64/PKGBUILD              |   31 -----------
 community-x86_64/drop-libgnomeui.patch |   64 ++++++++++++++++++++++++
 5 files changed, 210 insertions(+), 62 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-01-20 23:09:29 UTC (rev 208165)
+++ community-i686/PKGBUILD	2017-01-20 23:09:35 UTC (rev 208166)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Neil Darlow <neil at darlow.co.uk>
-
-pkgname=gnome-hearts
-pkgver=0.3.1
-pkgrel=2
-pkgdesc="A card game for GNOME"
-arch=('i686' 'x86_64')
-url="http://www.jejik.com/gnome-hearts/"
-license=('GPL')
-depends=('python2' 'libgnomeui' 'libglade' 'desktop-file-utils')
-makedepends=('intltool' 'rarian')
-source=(http://www.jejik.com/files/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('4b9477e8bb2d48a86021ae512a713fd405a96d52cf711ff549cfe0d119bf56b3')
-
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: gnome-hearts/repos/community-i686/PKGBUILD (from rev 208165, gnome-hearts/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-01-20 23:09:35 UTC (rev 208166)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Neil Darlow <neil at darlow.co.uk>
+
+pkgname=gnome-hearts
+pkgver=0.3.1
+pkgrel=3
+pkgdesc="A card game for GNOME"
+arch=('i686' 'x86_64')
+url="http://www.jejik.com/gnome-hearts/"
+license=('GPL')
+depends=('python2' 'libglade')
+makedepends=('intltool' 'rarian')
+source=(http://www.jejik.com/files/$pkgname/$pkgname-$pkgver.tar.gz
+        drop-libgnomeui.patch)
+sha256sums=('4b9477e8bb2d48a86021ae512a713fd405a96d52cf711ff549cfe0d119bf56b3'
+            'cc2743c2efbabdc0e40c404ce3d6155d85a959474401823d075bcbb15dae424e')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Remove libgnomeui dependency
+  patch -Np1 -i ../drop-libgnomeui.patch
+
+  autoreconf -fi
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: gnome-hearts/repos/community-i686/drop-libgnomeui.patch (from rev 208165, gnome-hearts/trunk/drop-libgnomeui.patch)
===================================================================
--- community-i686/drop-libgnomeui.patch	                        (rev 0)
+++ community-i686/drop-libgnomeui.patch	2017-01-20 23:09:35 UTC (rev 208166)
@@ -0,0 +1,64 @@
+diff -Naur gnome-hearts-0.3.1.orig/configure.in gnome-hearts-0.3.1/configure.in
+--- gnome-hearts-0.3.1.orig/configure.in	2013-06-09 15:05:11.000000000 +0200
++++ gnome-hearts-0.3.1/configure.in	2017-01-20 23:20:35.677689797 +0100
+@@ -23,7 +23,7 @@
+ fi
+ 
+ # Check for libraries. gmodule is required to make sure --export-dynamic is used and glade works
+-PKG_CHECK_MODULES(GNOME_HEARTS, [libgnomeui-2.0 gtk+-2.0 libglade-2.0 glib-2.0 gmodule-2.0])
++PKG_CHECK_MODULES(GNOME_HEARTS, [gtk+-2.0 libglade-2.0 glib-2.0 gmodule-2.0])
+ AC_SUBST(GNOME_HEARTS_CFLAGS)
+ AC_SUBST(GNOME_HEARTS_LIBS)
+ 
+diff -Naur gnome-hearts-0.3.1.orig/src/events.c gnome-hearts-0.3.1/src/events.c
+--- gnome-hearts-0.3.1.orig/src/events.c	2013-06-09 15:01:08.000000000 +0200
++++ gnome-hearts-0.3.1/src/events.c	2017-01-20 23:35:17.428651148 +0100
+@@ -71,13 +71,13 @@
+ /* Open the help file */
+ void on_help(GtkWidget *widget, gpointer data)
+ {
+-	gnome_help_display("gnome-hearts.xml", NULL, NULL);
++	gtk_show_uri(NULL, "ghelp:gnome-hearts", GDK_CURRENT_TIME, NULL);
+ }
+ 
+ /* Open the preferences help file */
+ void on_preferences_help(GtkWidget *widget, gpointer data)
+ {
+-	gnome_help_display("gnome-hearts.xml", "hearts-prefs", NULL);
++	gtk_show_uri(NULL, "ghelp:gnome-hearts?hearts-prefs", GDK_CURRENT_TIME, NULL);
+ }
+ 
+ /* About menu item */
+diff -Naur gnome-hearts-0.3.1.orig/src/hearts.c gnome-hearts-0.3.1/src/hearts.c
+--- gnome-hearts-0.3.1.orig/src/hearts.c	2013-06-09 15:01:08.000000000 +0200
++++ gnome-hearts-0.3.1/src/hearts.c	2017-01-20 23:20:21.447210208 +0100
+@@ -534,15 +534,11 @@
+ 		setlocale(LC_ALL, "");
+ 	#endif
+ 
+-	/* Initialize GNOME */
++	/* Initialize GTK+ */
+ 	GOptionContext *option_context = g_option_context_new(_("- Play a game of hearts"));
+ 	g_option_context_add_main_entries(option_context, option_entries, GETTEXT_PACKAGE);
+ 
+-	gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE,
+-			argc, argv,
+-			GNOME_PARAM_GOPTION_CONTEXT, option_context,
+-			GNOME_PARAM_APP_DATADIR, PACKAGE_DATA_DIR,
+-			GNOME_PARAM_NONE);
++	gtk_init(&argc, &argv);
+ 	
+ 	/* init the game's global variables */
+ 	game_score_labels = NULL;
+diff -Naur gnome-hearts-0.3.1.orig/src/hearts.h gnome-hearts-0.3.1/src/hearts.h
+--- gnome-hearts-0.3.1.orig/src/hearts.h	2013-06-09 15:01:08.000000000 +0200
++++ gnome-hearts-0.3.1/src/hearts.h	2017-01-20 23:22:33.691604109 +0100
+@@ -26,7 +26,7 @@
+ /* headers */
+ #include <glib/gi18n.h>
+ #include <dirent.h>
+-#include <gnome.h>
++#include <gtk/gtk.h>
+ #include <glade/glade.h>
+ #include "cards.h"
+ #include "cfg.h"

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-01-20 23:09:29 UTC (rev 208165)
+++ community-x86_64/PKGBUILD	2017-01-20 23:09:35 UTC (rev 208166)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Neil Darlow <neil at darlow.co.uk>
-
-pkgname=gnome-hearts
-pkgver=0.3.1
-pkgrel=2
-pkgdesc="A card game for GNOME"
-arch=('i686' 'x86_64')
-url="http://www.jejik.com/gnome-hearts/"
-license=('GPL')
-depends=('python2' 'libgnomeui' 'libglade' 'desktop-file-utils')
-makedepends=('intltool' 'rarian')
-source=(http://www.jejik.com/files/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('4b9477e8bb2d48a86021ae512a713fd405a96d52cf711ff549cfe0d119bf56b3')
-
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: gnome-hearts/repos/community-x86_64/PKGBUILD (from rev 208165, gnome-hearts/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-01-20 23:09:35 UTC (rev 208166)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Neil Darlow <neil at darlow.co.uk>
+
+pkgname=gnome-hearts
+pkgver=0.3.1
+pkgrel=3
+pkgdesc="A card game for GNOME"
+arch=('i686' 'x86_64')
+url="http://www.jejik.com/gnome-hearts/"
+license=('GPL')
+depends=('python2' 'libglade')
+makedepends=('intltool' 'rarian')
+source=(http://www.jejik.com/files/$pkgname/$pkgname-$pkgver.tar.gz
+        drop-libgnomeui.patch)
+sha256sums=('4b9477e8bb2d48a86021ae512a713fd405a96d52cf711ff549cfe0d119bf56b3'
+            'cc2743c2efbabdc0e40c404ce3d6155d85a959474401823d075bcbb15dae424e')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # Remove libgnomeui dependency
+  patch -Np1 -i ../drop-libgnomeui.patch
+
+  autoreconf -fi
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: gnome-hearts/repos/community-x86_64/drop-libgnomeui.patch (from rev 208165, gnome-hearts/trunk/drop-libgnomeui.patch)
===================================================================
--- community-x86_64/drop-libgnomeui.patch	                        (rev 0)
+++ community-x86_64/drop-libgnomeui.patch	2017-01-20 23:09:35 UTC (rev 208166)
@@ -0,0 +1,64 @@
+diff -Naur gnome-hearts-0.3.1.orig/configure.in gnome-hearts-0.3.1/configure.in
+--- gnome-hearts-0.3.1.orig/configure.in	2013-06-09 15:05:11.000000000 +0200
++++ gnome-hearts-0.3.1/configure.in	2017-01-20 23:20:35.677689797 +0100
+@@ -23,7 +23,7 @@
+ fi
+ 
+ # Check for libraries. gmodule is required to make sure --export-dynamic is used and glade works
+-PKG_CHECK_MODULES(GNOME_HEARTS, [libgnomeui-2.0 gtk+-2.0 libglade-2.0 glib-2.0 gmodule-2.0])
++PKG_CHECK_MODULES(GNOME_HEARTS, [gtk+-2.0 libglade-2.0 glib-2.0 gmodule-2.0])
+ AC_SUBST(GNOME_HEARTS_CFLAGS)
+ AC_SUBST(GNOME_HEARTS_LIBS)
+ 
+diff -Naur gnome-hearts-0.3.1.orig/src/events.c gnome-hearts-0.3.1/src/events.c
+--- gnome-hearts-0.3.1.orig/src/events.c	2013-06-09 15:01:08.000000000 +0200
++++ gnome-hearts-0.3.1/src/events.c	2017-01-20 23:35:17.428651148 +0100
+@@ -71,13 +71,13 @@
+ /* Open the help file */
+ void on_help(GtkWidget *widget, gpointer data)
+ {
+-	gnome_help_display("gnome-hearts.xml", NULL, NULL);
++	gtk_show_uri(NULL, "ghelp:gnome-hearts", GDK_CURRENT_TIME, NULL);
+ }
+ 
+ /* Open the preferences help file */
+ void on_preferences_help(GtkWidget *widget, gpointer data)
+ {
+-	gnome_help_display("gnome-hearts.xml", "hearts-prefs", NULL);
++	gtk_show_uri(NULL, "ghelp:gnome-hearts?hearts-prefs", GDK_CURRENT_TIME, NULL);
+ }
+ 
+ /* About menu item */
+diff -Naur gnome-hearts-0.3.1.orig/src/hearts.c gnome-hearts-0.3.1/src/hearts.c
+--- gnome-hearts-0.3.1.orig/src/hearts.c	2013-06-09 15:01:08.000000000 +0200
++++ gnome-hearts-0.3.1/src/hearts.c	2017-01-20 23:20:21.447210208 +0100
+@@ -534,15 +534,11 @@
+ 		setlocale(LC_ALL, "");
+ 	#endif
+ 
+-	/* Initialize GNOME */
++	/* Initialize GTK+ */
+ 	GOptionContext *option_context = g_option_context_new(_("- Play a game of hearts"));
+ 	g_option_context_add_main_entries(option_context, option_entries, GETTEXT_PACKAGE);
+ 
+-	gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE,
+-			argc, argv,
+-			GNOME_PARAM_GOPTION_CONTEXT, option_context,
+-			GNOME_PARAM_APP_DATADIR, PACKAGE_DATA_DIR,
+-			GNOME_PARAM_NONE);
++	gtk_init(&argc, &argv);
+ 	
+ 	/* init the game's global variables */
+ 	game_score_labels = NULL;
+diff -Naur gnome-hearts-0.3.1.orig/src/hearts.h gnome-hearts-0.3.1/src/hearts.h
+--- gnome-hearts-0.3.1.orig/src/hearts.h	2013-06-09 15:01:08.000000000 +0200
++++ gnome-hearts-0.3.1/src/hearts.h	2017-01-20 23:22:33.691604109 +0100
+@@ -26,7 +26,7 @@
+ /* headers */
+ #include <glib/gi18n.h>
+ #include <dirent.h>
+-#include <gnome.h>
++#include <gtk/gtk.h>
+ #include <glade/glade.h>
+ #include "cards.h"
+ #include "cfg.h"



More information about the arch-commits mailing list