[arch-commits] Commit in gtksourceview-sharp-2.0/repos (4 files)

Fri Dec 26 13:37:08 UTC 2008

Date: Friday, December 26, 2008 @ 08:37:07
  Author: jgc
Revision: 22333

Merged revisions 356,8091,22332 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gtksourceview-sharp-2.0/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r8091 | ronald | 2008-08-06 08:50:59 +0000 (Wed, 06 Aug 2008) | 1 line
  
  fix license & add arch field
........
  r22332 | jgc | 2008-12-26 13:36:53 +0000 (Fri, 26 Dec 2008) | 1 line
  
  upgpkg: gtksourceview-sharp-2.0 0.12-1
........

Added:
  gtksourceview-sharp-2.0/repos/extra-i686/gtksourceview-sharp2-gnome-print.patch
    (from rev 22332, gtksourceview-sharp-2.0/trunk/gtksourceview-sharp2-gnome-print.patch)
Modified:
  gtksourceview-sharp-2.0/repos/extra-i686/	(properties)
  gtksourceview-sharp-2.0/repos/extra-i686/PKGBUILD
Deleted:
  gtksourceview-sharp-2.0/repos/extra-i686/dont-install-langdata.patch

----------------------------------------+
 PKGBUILD                               |   41 ++++++++++------------
 dont-install-langdata.patch            |   20 ----------
 gtksourceview-sharp2-gnome-print.patch |   57 +++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 41 deletions(-)


Property changes on: gtksourceview-sharp-2.0/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gtksourceview-sharp-2.0/trunk:1
   + /gtksourceview-sharp-2.0/trunk:1-22332

Modified: extra-i686/PKGBUILD
===================================================================

--- extra-i686/PKGBUILD	2008-12-26 13:36:53 UTC (rev 22332)
+++ extra-i686/PKGBUILD	2008-12-26 13:37:07 UTC (rev 22333)
@@ -3,30 +3,29 @@
 # Contributor: Brice Carpentier <brice at daknet.org>
 
 pkgname=gtksourceview-sharp-2.0
-pkgver=0.10
-pkgrel=5
+pkgver=0.12
+pkgrel=1
 pkgdesc="a C# binding to gtksourceview"
 url="http://www.mono-project.com/"
-depends=('gtksourceview' 'gtk-sharp-2>=2.6')
-conflicts=(gtksourceview-sharp)
-provides=(gtksourceview-sharp)
-source=(http://go-mono.com/sources/gtksourceview-sharp-2.0/gtksourceview-sharp-2.0-${pkgver}.tar.gz
-				dont-install-langdata.patch)
-md5sums=(2179634b8931e6be849a1e1f82c834e3 eeab3108b82d5590f2adab826ae91cc2)
+depends=('gtksourceview' 'gtk-sharp-2>=2.12.7' 'gnome-sharp>=2.24.0')
+makedepends=('monodoc')
+conflicts=('gtksourceview-sharp')
+provides=('gtksourceview-sharp')
+source=(http://ftp.novell.com/pub/mono/sources/gtksourceview-sharp2/${pkgname}-${pkgver}.tar.bz2
+	gtksourceview-sharp2-gnome-print.patch)
+license=('LGPL2')
+arch=('i686' 'x86_64')
 
 build() {
-	[ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
- # get rid of that .wapi errors; thanks to brice
-	export MONO_SHARED_DIR=${startdir}/src/weird
-	mkdir -p ${MONO_SHARED_DIR}
- # build
-  cd ${startdir}/src/gtksourceview-sharp-2.0-${pkgver}
-	patch -Np0 -i ${startdir}/src/dont-install-langdata.patch || return 1
-  ./configure --prefix=/usr
+  export MONO_SHARED_DIR="${srcdir}/weird"
+  mkdir -p "${MONO_SHARED_DIR}"
+
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/gtksourceview-sharp2-gnome-print.patch" || return 1
+  autoreconf || return 1
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make GACUTIL="/usr/bin/gacutil /root ${startdir}/pkg/usr/lib" \
-    DESTDIR=${startdir}/pkg install
- # housecleaning
-  rm -rf ${MONO_SHARED_DIR}
+  make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \
+    DESTDIR="${pkgdir}" install || return 1
+  rm -rf "${pkgdir}/usr/share/gtksourceview-1.0"
 }
-# vim: ft=sh ts=2

Deleted: extra-i686/dont-install-langdata.patch
===================================================================
--- extra-i686/dont-install-langdata.patch	2008-12-26 13:36:53 UTC (rev 22332)
+++ extra-i686/dont-install-langdata.patch	2008-12-26 13:37:07 UTC (rev 22333)
@@ -1,20 +0,0 @@
---- Makefile.in.orig	2006-01-23 08:51:14.000000000 +0000
-+++ Makefile.in	2006-01-23 08:51:29.000000000 +0000
-@@ -582,7 +582,7 @@
- 
- info-am:
- 
--install-data-am: install-extra_langDATA install-pkgconfigDATA
-+install-data-am: install-pkgconfigDATA
- 
- install-exec-am:
- 
-@@ -610,7 +610,7 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-extra_langDATA uninstall-info-am \
-+uninstall-am: uninstall-info-am \
- 	uninstall-pkgconfigDATA
- 
- uninstall-info: uninstall-info-recursive

Copied: gtksourceview-sharp-2.0/repos/extra-i686/gtksourceview-sharp2-gnome-print.patch (from rev 22332, gtksourceview-sharp-2.0/trunk/gtksourceview-sharp2-gnome-print.patch)
===================================================================
--- extra-i686/gtksourceview-sharp2-gnome-print.patch	                        (rev 0)
+++ extra-i686/gtksourceview-sharp2-gnome-print.patch	2008-12-26 13:37:07 UTC (rev 22333)
@@ -0,0 +1,57 @@
+--- configure.in	2008-02-26 16:30:05.000000000 -0700
++++ configure.in	2008-09-05 13:36:30.000000000 -0600
+@@ -69,6 +69,16 @@
+ gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-2.0`
+ AC_SUBST(gtksharp_prefix)
+ 
++PKG_CHECK_MODULES(GNOMEPRINT_SHARP, gnome-print-sharp-2.18, use_gnomeprint=yes, use_gnomeprint=no)
++if test "x$use_gnomeprint" = "xyes" ; then
++GNOMEPRINT_SHARP_REQUIRES=gnome-print-sharp-2.18
++else
++GNOMEPRINT_SHARP_REQUIRES=
++fi
++AC_SUBST(GNOMEPRINT_SHARP_CFLAGS)
++AC_SUBST(GNOMEPRINT_SHARP_LIBS)
++AC_SUBST(GNOMEPRINT_SHARP_REQUIRES)
++
+ PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-1.0 >= 1.0.0)
+ AC_SUBST(GTKSOURCEVIEW_LIBS)
+ gtksourceview_prefix=`pkg-config --variable=prefix gtksourceview-1.0`
+--- gtksourceview/Makefile.am	2008-02-26 16:30:05.000000000 -0700
++++ gtksourceview/Makefile.am	2008-09-05 13:14:53.000000000 -0600
+@@ -2,7 +2,7 @@
+ LIBRARY=	$(LIBRARY_NAME).dll
+ APIS=		gtksourceview-api.xml
+ 
+-ASSEMBLIES=	/pkg:gnome-sharp-2.0
++ASSEMBLIES=	$(GTK_SHARP_LIBS) $(GNOMEPRINT_SHARP_LIBS)
+ 
+ EXTRA_DIST = $(sources) $(customs) Gtk.metadata gtksourceview-api.raw AssemblyInfo.cs.in
+ 
+@@ -21,7 +21,7 @@
+ 	$(GAPI_FIXUP) --api=gtksourceview-api.xml --metadata=$(srcdir)/Gtk.metadata
+ 
+ generated-stamp: $(APIS) $(customs) $(sources) Gtk.metadata
+-	$(GAPI_CODEGEN) $(GTK_SHARP_CFLAGS) --generate $(APIS) \
++	$(GAPI_CODEGEN) $(GTK_SHARP_CFLAGS) $(GNOMEPRINT_SHARP_CFLAGS) --generate $(APIS) \
+ 	--outdir=generated --customdir=. --assembly-name=gtksourceview-sharp && touch generated-stamp
+ 
+ sources = \
+--- gtksourceview-sharp-2.0.pc.in	2008-02-26 16:30:05.000000000 -0700
++++ gtksourceview-sharp-2.0.pc.in	2008-09-05 13:22:33.000000000 -0600
+@@ -6,5 +6,5 @@
+ Name: GtkSourceView#
+ Description: GtkSourceView# - gtksourceview .NET Binding
+ Version: @VERSION@
+-Requires: gnome-sharp-2.0
++Requires: gnome-sharp-2.0 @GNOMEPRINT_SHARP_REQUIRES@
+ Libs: -r:${prefix}/lib/mono/gtksourceview-sharp-2.0/gtksourceview-sharp.dll
+--- sample/Makefile.am	2008-02-26 16:30:05.000000000 -0700
++++ sample/Makefile.am	2008-09-05 13:35:34.000000000 -0600
+@@ -10,5 +10,5 @@
+ 	$(CSC) -out:$@ $(srcdir)/SourceViewTest.cs -r:../gtksourceview/gtksourceview-sharp.dll -pkg:gtk-sharp-2.0
+ 
+ $(PRINT): $(srcdir)/PrintSample.cs
+-	$(CSC) -out:$@ $(srcdir)/PrintSample.cs -r:../gtksourceview/gtksourceview-sharp.dll -pkg:gtk-sharp-2.0 -pkg:gnome-sharp-2.0
++	$(CSC) -out:$@ $(srcdir)/PrintSample.cs -r:../gtksourceview/gtksourceview-sharp.dll -pkg:gtk-sharp-2.0 -pkg:gnome-sharp-2.0 $(GNOMEPRINT_SHARP_LIBS)
+ 


