Initial commit

7 files changed, 273 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..71394b0cccff
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,29 @@
+# Generated by mksrcinfo v8
+# Tue Jan 12 02:58:57 UTC 2016
+pkgbase = guile1.8-gtk
+	pkgdesc = Guile (Scheme) bindings for GTK+
+	pkgver = 2.1
+	pkgrel = 3
+	url = http://www.nongnu.org/guile-gtk/
+	arch = i686
+	arch = x86_64
+	license = GPL
+	depends = guile>=1.8.1
+	depends = gtk2
+	depends = gtkglarea
+	options = !makeflags
+	source = ftp://ftp.gnu.org/gnu/guile-gtk/guile-gtk-2.1.tar.gz
+	source = deprecated.patch
+	source = brokentest.patch
+	source = g-object-ref.diff
+	source = prll-install.patch
+	source = guile1.8.patch
+	md5sums = 4ed9b00f4cefdef412923270d8ad02a5
+	md5sums = f1e28215b95c0bf10eacd8dacb6f2d55
+	md5sums = edfde0720a7b2f70f2d15aaca72dc704
+	md5sums = 191a9979bf975c30169247ab685cabc8
+	md5sums = be846cdb7eac97495b4fa6ae23a624d1
+	md5sums = 7d70c49c4f0565b270863038ab9f5919
+
+pkgname = guile1.8-gtk
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..ba90e176a6bc
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Alexander Minges <alexander.minges@gmail.com>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Former Maintainer: Jan de Groot <jgc@archlinux.org>
+# Current Contributor: Patrick McCarty <pnorcks at gmail dot com>
+
+pkgname=guile1.8-gtk
+_pkgname=guile-gtk
+pkgver=2.1
+pkgrel=3
+pkgdesc="Guile (Scheme) bindings for GTK+"
+arch=('i686' 'x86_64')
+url="http://www.nongnu.org/guile-gtk/"
+license=('GPL')
+depends=('guile>=1.8.1' 'gtk2' 'gtkglarea')
+options=('!makeflags')
+source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.gz deprecated.patch
+        brokentest.patch
+        g-object-ref.diff
+        prll-install.patch
+        guile1.8.patch)
+md5sums=('4ed9b00f4cefdef412923270d8ad02a5'
+         'f1e28215b95c0bf10eacd8dacb6f2d55'
+         'edfde0720a7b2f70f2d15aaca72dc704'
+         '191a9979bf975c30169247ab685cabc8'
+         'be846cdb7eac97495b4fa6ae23a624d1'
+         '7d70c49c4f0565b270863038ab9f5919')
+
+build() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+  patch -Np1 -i ../deprecated.patch
+  patch -Np1 -i ../brokentest.patch
+  patch -Np1 -i ../prll-install.patch
+  patch -Np1 -i ../guile1.8.patch
+  
+  #aclocal
+  # libtoolize --automake --copy
+  #autoconf
+  #automake --copy --add-missing --gnu
+  
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/brokentest.patch b/brokentest.patch
new file mode 100644
index 000000000000..89bc538f65a1
--- /dev/null
+++ b/brokentest.patch
@@ -0,0 +1,33 @@
+diff --git a/tests/gdk.scm b/tests/gdk.scm
+index 6e08f9f..6b01e83 100644
+--- a/tests/gdk.scm
++++ b/tests/gdk.scm
+@@ -1102,28 +1102,6 @@
+ 	  (got  (exact-positive-integer? (gdk-screen-height-mm))))
+      (test "gdk-screen-height-mm" #f want got))))
+ 
+-;;
+-;; gdk-selection-property-get
+-;;
+-
+-(malloced-steady  ;; with nothing ever requested
+- (lambda ()
+-   (let* ((win    sample-win)
+-	  (want   '(#f NONE 0))
+-	  (got    (gdk-selection-property-get win)))
+-     (test "gdk-selection-property-get" sample-win want got))))
+-
+-(malloced-steady  ;; on a destroyed window
+- (lambda ()
+-   (let* ((win    (gdk-window-new #f 100 100 '() 'input-output 'toplevel))
+-	  (want   '(#f NONE 0))
+-	  (got    (begin
+-		    (gdk-window-destroy win)
+-		    (gdk-selection-property-get win))))
+-     ;; final free()s only take place under the main loop, so need this to
+-     ;; satisfy `malloced-steady
+-     (gtk-main-iteration-do #f)
+-     (test "gdk-selection-property-get" (list "destroyed win" win) want got))))
+ 
+ ;;
+ ;; gdk-text-extents 
diff --git a/deprecated.patch b/deprecated.patch
new file mode 100644
index 000000000000..1c7097436e3d
--- /dev/null
+++ b/deprecated.patch
@@ -0,0 +1,52 @@
+Source:
+
+http://bugs.gentoo.org/attachment.cgi?id=184839&action=view
+
+diff -ur guile-gtk-2.0.orig/gtk-gl/gdk-gl.defs guile-gtk-2.0/gtk-gl/gdk-gl.defs
+--- guile-gtk-2.0.orig/gtk-gl/gdk-gl.defs	2006-12-09 02:23:15.000000000 +0100
++++ guile-gtk-2.0/gtk-gl/gdk-gl.defs	2009-03-12 22:46:52.000000000 +0100
+@@ -22,14 +22,14 @@
+ ;--- Types ... --------------------------------------------------------
+ 
+ (define-struct GdkGLContext
+-  (copy gdk_gl_context_ref)
+-  (free gdk_gl_context_unref)
++  (copy g_object_ref)
++  (free g_object_unref)
+   (size "0")
+   (canonical-name "Gdk" "GL" "Context"))
+ 
+ (define-struct GdkGLPixmap
+-  (copy gdk_gl_pixmap_ref)
+-  (free gdk_gl_pixmap_unref)
++  (copy g_object_ref)
++  (free g_object_unref)
+   (size "0")
+   (canonical-name "Gdk" "GL" "Pixmap"))
+ 
+diff -ur guile-gtk-2.0.orig/gtk-gl/gdk-gl-glue.c guile-gtk-2.0/gtk-gl/gdk-gl-glue.c
+--- guile-gtk-2.0.orig/gtk-gl/gdk-gl-glue.c	2006-12-22 10:31:01.000000000 +0100
++++ guile-gtk-2.0/gtk-gl/gdk-gl-glue.c	2009-03-12 22:44:24.000000000 +0100
+@@ -83,8 +83,8 @@
+ 
+ sgtk_boxed_info sgtk_gdk_gl_context_info = {
+   { "GdkGLContext", GTK_TYPE_BOXED, NULL },
+-  (void *(*)(void*))gdk_gl_context_ref,
+-  (void (*)(void*))gdk_gl_context_unref,
++  (void *(*)(void*))g_object_ref,
++  (void (*)(void*))g_object_unref,
+   (void (*)(SCM)) NULL,
+   0
+ };
+@@ -100,8 +100,8 @@
+ 
+ sgtk_boxed_info sgtk_gdk_gl_pixmap_info = {
+   { "GdkGLPixmap", GTK_TYPE_BOXED, NULL },
+-  (void *(*)(void*))gdk_gl_pixmap_ref,
+-  (void (*)(void*))gdk_gl_pixmap_unref,
++  (void *(*)(void*))g_object_ref,
++  (void (*)(void*))g_object_unref,
+   (void (*)(SCM)) NULL,
+   0
+ };
+
diff --git a/g-object-ref.diff b/g-object-ref.diff
new file mode 100644
index 000000000000..cc4231ceeee5
--- /dev/null
+++ b/g-object-ref.diff
@@ -0,0 +1,45 @@
+--- guile-gtk-2.0.orig/gtk-gl/gdk-gl.defs
++++ guile-gtk-2.0/gtk-gl/gdk-gl.defs
+@@ -22,14 +22,14 @@
+ ;--- Types ... --------------------------------------------------------
+ 
+ (define-struct GdkGLContext
+-  (copy gdk_gl_context_ref)
+-  (free gdk_gl_context_unref)
++  (copy g_object_ref)
++  (free g_object_unref)
+   (size "0")
+   (canonical-name "Gdk" "GL" "Context"))
+ 
+ (define-struct GdkGLPixmap
+-  (copy gdk_gl_pixmap_ref)
+-  (free gdk_gl_pixmap_unref)
++  (copy g_object_ref)
++  (free g_object_unref)
+   (size "0")
+   (canonical-name "Gdk" "GL" "Pixmap"))
+ 
+--- guile-gtk-2.0.orig/gtk-gl/gdk-gl-glue.c
++++ guile-gtk-2.0/gtk-gl/gdk-gl-glue.c
+@@ -83,8 +83,8 @@
+ 
+ sgtk_boxed_info sgtk_gdk_gl_context_info = {
+   { "GdkGLContext", GTK_TYPE_BOXED, NULL },
+-  (void *(*)(void*))gdk_gl_context_ref,
+-  (void (*)(void*))gdk_gl_context_unref,
++  (void *(*)(void*))g_object_ref,
++  (void (*)(void*))g_object_unref,
+   (void (*)(SCM)) NULL,
+   0
+ };
+@@ -100,8 +100,8 @@
+ 
+ sgtk_boxed_info sgtk_gdk_gl_pixmap_info = {
+   { "GdkGLPixmap", GTK_TYPE_BOXED, NULL },
+-  (void *(*)(void*))gdk_gl_pixmap_ref,
+-  (void (*)(void*))gdk_gl_pixmap_unref,
++  (void *(*)(void*))g_object_ref,
++  (void (*)(void*))g_object_unref,
+   (void (*)(SCM)) NULL,
+   0
+ };
\ No newline at end of file
diff --git a/guile1.8.patch b/guile1.8.patch
new file mode 100644
index 000000000000..3547a5bdc83b
--- /dev/null
+++ b/guile1.8.patch
@@ -0,0 +1,54 @@
+diff -aur guile-gtk-2.1_orig/aclocal.m4 guile-gtk-2.1/aclocal.m4
+--- guile-gtk-2.1_orig/aclocal.m4	2007-12-19 04:03:43.000000000 +0100
++++ guile-gtk-2.1/aclocal.m4	2016-01-12 02:53:18.028799748 +0100
+@@ -609,17 +609,17 @@
+ # The variables are marked for substitution, as by @code{AC_SUBST}.
+ #
+ AC_DEFUN([GUILE_PROGS],
+- [AC_PATH_PROG(GUILE,guile)
++ [AC_PATH_PROG(GUILE,guile1.8)
+   if test "$GUILE" = "" ; then
+       AC_MSG_ERROR([guile required but not found])
+   fi
+   AC_SUBST(GUILE)
+-  AC_PATH_PROG(GUILE_CONFIG,guile-config)
++  AC_PATH_PROG(GUILE_CONFIG,guile-config1.8)
+   if test "$GUILE_CONFIG" = "" ; then
+       AC_MSG_ERROR([guile-config required but not found])
+   fi
+   AC_SUBST(GUILE_CONFIG)
+-  AC_PATH_PROG(GUILE_TOOLS,guile-tools)
++  AC_PATH_PROG(GUILE_TOOLS,guile-tools1.8)
+   AC_SUBST(GUILE_TOOLS)
+  ])
+ 
+diff -aur guile-gtk-2.1_orig/configure guile-gtk-2.1/configure
+--- guile-gtk-2.1_orig/configure	2007-12-19 04:04:26.000000000 +0100
++++ guile-gtk-2.1/configure	2016-01-12 03:03:40.641386112 +0100
+@@ -20162,7 +20162,7 @@
+ 
+ 
+ # Extract the first word of "guile", so it can be a program name with args.
+-set dummy guile; ac_word=$2
++set dummy guile1.8; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE+set}" = set; then
+@@ -20208,7 +20208,7 @@
+   fi
+ 
+   # Extract the first word of "guile-config", so it can be a program name with args.
+-set dummy guile-config; ac_word=$2
++set dummy guile-config1.8; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE_CONFIG+set}" = set; then
+@@ -20254,7 +20254,7 @@
+   fi
+ 
+   # Extract the first word of "guile-tools", so it can be a program name with args.
+-set dummy guile-tools; ac_word=$2
++set dummy guile-tools1.8; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE_TOOLS+set}" = set; then
diff --git a/prll-install.patch b/prll-install.patch
new file mode 100644
index 000000000000..c40d4af7b1bc
--- /dev/null
+++ b/prll-install.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 822a170..37f43b5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -72,7 +72,7 @@ gdkdefs = gdk-2.0.defs
+ defsdir = $(datadir)/guile-gtk/
+ defs_DATA = $(gtkdefs) $(gdkdefs) 
+ 
+-install-exec-local:
++install-exec-hook:
+ 	rm -f $(DESTDIR)$(bindir)/build-guile-gtk
+ 	rm -f $(DESTDIR)$(bindir)/guile-gtk
+ 	ln $(DESTDIR)$(bindir)/build-guile-gtk-2.0 $(DESTDIR)$(bindir)/build-guile-gtk
\ No newline at end of file