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

Jelle van der Waa jelle at nymeria.archlinux.org
Tue Mar 11 21:10:27 UTC 2014


    Date: Tuesday, March 11, 2014 @ 22:10:27
  Author: jelle
Revision: 107053

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

Added:
  classpath/repos/community-i686/PKGBUILD
    (from rev 107052, classpath/trunk/PKGBUILD)
  classpath/repos/community-i686/freetype2_include.patch
    (from rev 107052, classpath/trunk/freetype2_include.patch)
  classpath/repos/community-x86_64/PKGBUILD
    (from rev 107052, classpath/trunk/PKGBUILD)
  classpath/repos/community-x86_64/freetype2_include.patch
    (from rev 107052, classpath/trunk/freetype2_include.patch)
Deleted:
  classpath/repos/community-i686/PKGBUILD
  classpath/repos/community-x86_64/PKGBUILD

------------------------------------------+
 /PKGBUILD                                |  140 +++++++++++++++++++++++++++++
 community-i686/PKGBUILD                  |   66 -------------
 community-i686/freetype2_include.patch   |   34 +++++++
 community-x86_64/PKGBUILD                |   66 -------------
 community-x86_64/freetype2_include.patch |   34 +++++++
 5 files changed, 208 insertions(+), 132 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-03-11 21:10:18 UTC (rev 107052)
+++ community-i686/PKGBUILD	2014-03-11 21:10:27 UTC (rev 107053)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: tardo <tardo at nagi-fanboi.net>
-# Contributor: Sean Gillespie <Sean.D.Gillespie at gmail.com>
-
-pkgname=classpath
-pkgver=0.98
-pkgrel=6
-pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/classpath/"
-license=('GPL')
-depends=('gtk2>=2.8' 'libxtst' 'libsm')
-makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'java-environment')
-optdepends=('file' 'gconf')
-source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz)
-md5sums=('90c6571b8b0309e372faa0f9f6255ea9')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  patch -p0 Makefile.in <<EOF
-298,299c298,299
-< SUBDIRS = lib doc external include native resource scripts \$(TOOLSDIR) \$(EXAMPLESDIR)
-< DIST_SUBDIRS = lib doc external include native resource scripts tools examples
----
-> SUBDIRS = lib doc external include native resource scripts
-> DIST_SUBDIRS = lib doc external include native resource scripts
-EOF
-
-  ./configure --prefix=/usr --disable-Werror --disable-plugin
-  make EXAMPLESDIR=
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make EXAMPLESDIR= DESTDIR=$pkgdir install
-
-  rm -f $pkgdir/usr/bin/gappletviewer
-  rm -f $pkgdir/usr/bin/gjar
-  rm -f $pkgdir/usr/bin/gjarsigner
-  rm -f $pkgdir/usr/bin/gjavah
-  rm -f $pkgdir/usr/bin/gkeytool
-  rm -f $pkgdir/usr/bin/gnative2ascii
-  rm -f $pkgdir/usr/bin/gorbd
-  rm -f $pkgdir/usr/bin/grmic
-  rm -f $pkgdir/usr/bin/grmid
-  rm -f $pkgdir/usr/bin/grmiregistry
-  rm -f $pkgdir/usr/bin/gserialver
-  rm -f $pkgdir/usr/bin/gtnameserv
-  rm -f $pkgdir/usr/lib/logging.properties
-  rm -f $pkgdir/usr/lib/security/classpath.security
-  rm -f $pkgdir/usr/share/man/man1/gappletviewer.1*
-  rm -f $pkgdir/usr/share/man/man1/gcjh.1*
-  rm -f $pkgdir/usr/share/man/man1/gjar.1*
-  rm -f $pkgdir/usr/share/man/man1/gjarsigner.1*
-  rm -f $pkgdir/usr/share/man/man1/gjavah.1*
-  rm -f $pkgdir/usr/share/man/man1/gkeytool.1*
-  rm -f $pkgdir/usr/share/man/man1/gnative2ascii.1*
-  rm -f $pkgdir/usr/share/man/man1/gorbd.1*
-  rm -f $pkgdir/usr/share/man/man1/grmid.1*
-  rm -f $pkgdir/usr/share/man/man1/grmiregistry.1*
-  rm -f $pkgdir/usr/share/man/man1/gserialver.1*
-  rm -f $pkgdir/usr/share/man/man1/gtnameserv.1*
-  rm -f $pkgdir/usr/share/info/dir
-}

Copied: classpath/repos/community-i686/PKGBUILD (from rev 107052, classpath/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-03-11 21:10:27 UTC (rev 107053)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: tardo <tardo at nagi-fanboi.net>
+# Contributor: Sean Gillespie <Sean.D.Gillespie at gmail.com>
+
+pkgname=classpath
+pkgver=0.98
+pkgrel=7
+pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/classpath/"
+license=('GPL')
+depends=('gtk2>=2.8' 'libxtst' 'libsm' 'freetype2')
+makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'java-environment')
+optdepends=('file' 'gconf')
+source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz freetype2_include.patch)
+md5sums=('90c6571b8b0309e372faa0f9f6255ea9'
+         '55dafc301c5f2e497696d01e9c1dab9c')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  patch -p0 Makefile.in <<EOF
+298,299c298,299
+< SUBDIRS = lib doc external include native resource scripts \$(TOOLSDIR) \$(EXAMPLESDIR)
+< DIST_SUBDIRS = lib doc external include native resource scripts tools examples
+---
+> SUBDIRS = lib doc external include native resource scripts
+> DIST_SUBDIRS = lib doc external include native resource scripts
+EOF
+
+  # fix freetype2 include path 
+  patch -Np1 -i $srcdir/freetype2_include.patch
+
+  ./configure --prefix=/usr --disable-Werror --disable-plugin
+  make EXAMPLESDIR=
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make EXAMPLESDIR= DESTDIR=$pkgdir install
+
+  rm -f $pkgdir/usr/bin/gappletviewer
+  rm -f $pkgdir/usr/bin/gjar
+  rm -f $pkgdir/usr/bin/gjarsigner
+  rm -f $pkgdir/usr/bin/gjavah
+  rm -f $pkgdir/usr/bin/gkeytool
+  rm -f $pkgdir/usr/bin/gnative2ascii
+  rm -f $pkgdir/usr/bin/gorbd
+  rm -f $pkgdir/usr/bin/grmic
+  rm -f $pkgdir/usr/bin/grmid
+  rm -f $pkgdir/usr/bin/grmiregistry
+  rm -f $pkgdir/usr/bin/gserialver
+  rm -f $pkgdir/usr/bin/gtnameserv
+  rm -f $pkgdir/usr/lib/logging.properties
+  rm -f $pkgdir/usr/lib/security/classpath.security
+  rm -f $pkgdir/usr/share/man/man1/gappletviewer.1*
+  rm -f $pkgdir/usr/share/man/man1/gcjh.1*
+  rm -f $pkgdir/usr/share/man/man1/gjar.1*
+  rm -f $pkgdir/usr/share/man/man1/gjarsigner.1*
+  rm -f $pkgdir/usr/share/man/man1/gjavah.1*
+  rm -f $pkgdir/usr/share/man/man1/gkeytool.1*
+  rm -f $pkgdir/usr/share/man/man1/gnative2ascii.1*
+  rm -f $pkgdir/usr/share/man/man1/gorbd.1*
+  rm -f $pkgdir/usr/share/man/man1/grmid.1*
+  rm -f $pkgdir/usr/share/man/man1/grmiregistry.1*
+  rm -f $pkgdir/usr/share/man/man1/gserialver.1*
+  rm -f $pkgdir/usr/share/man/man1/gtnameserv.1*
+  rm -f $pkgdir/usr/share/info/dir
+}

Copied: classpath/repos/community-i686/freetype2_include.patch (from rev 107052, classpath/trunk/freetype2_include.patch)
===================================================================
--- community-i686/freetype2_include.patch	                        (rev 0)
+++ community-i686/freetype2_include.patch	2014-03-11 21:10:27 UTC (rev 107053)
@@ -0,0 +1,34 @@
+diff -aur classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
+--- classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	2008-12-18 01:43:41.000000000 +0100
++++ classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	2014-03-11 22:03:55.888827143 +0100
+@@ -42,8 +42,9 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #include "jcl.h"
+ #include "gdkfont.h"
+ #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
+diff -aur classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
+--- classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	2007-04-25 16:53:04.000000000 +0200
++++ classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	2014-03-11 22:03:18.788834707 +0100
+@@ -39,10 +39,11 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttypes.h>
+-#include <freetype/tttables.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TYPES_H
++#include FT_TRUETYPE_TABLES_H
+ #include "gdkfont.h"
+ #include "gtkpeer.h"
+ #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-03-11 21:10:18 UTC (rev 107052)
+++ community-x86_64/PKGBUILD	2014-03-11 21:10:27 UTC (rev 107053)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: tardo <tardo at nagi-fanboi.net>
-# Contributor: Sean Gillespie <Sean.D.Gillespie at gmail.com>
-
-pkgname=classpath
-pkgver=0.98
-pkgrel=6
-pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/classpath/"
-license=('GPL')
-depends=('gtk2>=2.8' 'libxtst' 'libsm')
-makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'java-environment')
-optdepends=('file' 'gconf')
-source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz)
-md5sums=('90c6571b8b0309e372faa0f9f6255ea9')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  patch -p0 Makefile.in <<EOF
-298,299c298,299
-< SUBDIRS = lib doc external include native resource scripts \$(TOOLSDIR) \$(EXAMPLESDIR)
-< DIST_SUBDIRS = lib doc external include native resource scripts tools examples
----
-> SUBDIRS = lib doc external include native resource scripts
-> DIST_SUBDIRS = lib doc external include native resource scripts
-EOF
-
-  ./configure --prefix=/usr --disable-Werror --disable-plugin
-  make EXAMPLESDIR=
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make EXAMPLESDIR= DESTDIR=$pkgdir install
-
-  rm -f $pkgdir/usr/bin/gappletviewer
-  rm -f $pkgdir/usr/bin/gjar
-  rm -f $pkgdir/usr/bin/gjarsigner
-  rm -f $pkgdir/usr/bin/gjavah
-  rm -f $pkgdir/usr/bin/gkeytool
-  rm -f $pkgdir/usr/bin/gnative2ascii
-  rm -f $pkgdir/usr/bin/gorbd
-  rm -f $pkgdir/usr/bin/grmic
-  rm -f $pkgdir/usr/bin/grmid
-  rm -f $pkgdir/usr/bin/grmiregistry
-  rm -f $pkgdir/usr/bin/gserialver
-  rm -f $pkgdir/usr/bin/gtnameserv
-  rm -f $pkgdir/usr/lib/logging.properties
-  rm -f $pkgdir/usr/lib/security/classpath.security
-  rm -f $pkgdir/usr/share/man/man1/gappletviewer.1*
-  rm -f $pkgdir/usr/share/man/man1/gcjh.1*
-  rm -f $pkgdir/usr/share/man/man1/gjar.1*
-  rm -f $pkgdir/usr/share/man/man1/gjarsigner.1*
-  rm -f $pkgdir/usr/share/man/man1/gjavah.1*
-  rm -f $pkgdir/usr/share/man/man1/gkeytool.1*
-  rm -f $pkgdir/usr/share/man/man1/gnative2ascii.1*
-  rm -f $pkgdir/usr/share/man/man1/gorbd.1*
-  rm -f $pkgdir/usr/share/man/man1/grmid.1*
-  rm -f $pkgdir/usr/share/man/man1/grmiregistry.1*
-  rm -f $pkgdir/usr/share/man/man1/gserialver.1*
-  rm -f $pkgdir/usr/share/man/man1/gtnameserv.1*
-  rm -f $pkgdir/usr/share/info/dir
-}

Copied: classpath/repos/community-x86_64/PKGBUILD (from rev 107052, classpath/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-03-11 21:10:27 UTC (rev 107053)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: tardo <tardo at nagi-fanboi.net>
+# Contributor: Sean Gillespie <Sean.D.Gillespie at gmail.com>
+
+pkgname=classpath
+pkgver=0.98
+pkgrel=7
+pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/classpath/"
+license=('GPL')
+depends=('gtk2>=2.8' 'libxtst' 'libsm' 'freetype2')
+makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'java-environment')
+optdepends=('file' 'gconf')
+source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz freetype2_include.patch)
+md5sums=('90c6571b8b0309e372faa0f9f6255ea9'
+         '55dafc301c5f2e497696d01e9c1dab9c')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  patch -p0 Makefile.in <<EOF
+298,299c298,299
+< SUBDIRS = lib doc external include native resource scripts \$(TOOLSDIR) \$(EXAMPLESDIR)
+< DIST_SUBDIRS = lib doc external include native resource scripts tools examples
+---
+> SUBDIRS = lib doc external include native resource scripts
+> DIST_SUBDIRS = lib doc external include native resource scripts
+EOF
+
+  # fix freetype2 include path 
+  patch -Np1 -i $srcdir/freetype2_include.patch
+
+  ./configure --prefix=/usr --disable-Werror --disable-plugin
+  make EXAMPLESDIR=
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make EXAMPLESDIR= DESTDIR=$pkgdir install
+
+  rm -f $pkgdir/usr/bin/gappletviewer
+  rm -f $pkgdir/usr/bin/gjar
+  rm -f $pkgdir/usr/bin/gjarsigner
+  rm -f $pkgdir/usr/bin/gjavah
+  rm -f $pkgdir/usr/bin/gkeytool
+  rm -f $pkgdir/usr/bin/gnative2ascii
+  rm -f $pkgdir/usr/bin/gorbd
+  rm -f $pkgdir/usr/bin/grmic
+  rm -f $pkgdir/usr/bin/grmid
+  rm -f $pkgdir/usr/bin/grmiregistry
+  rm -f $pkgdir/usr/bin/gserialver
+  rm -f $pkgdir/usr/bin/gtnameserv
+  rm -f $pkgdir/usr/lib/logging.properties
+  rm -f $pkgdir/usr/lib/security/classpath.security
+  rm -f $pkgdir/usr/share/man/man1/gappletviewer.1*
+  rm -f $pkgdir/usr/share/man/man1/gcjh.1*
+  rm -f $pkgdir/usr/share/man/man1/gjar.1*
+  rm -f $pkgdir/usr/share/man/man1/gjarsigner.1*
+  rm -f $pkgdir/usr/share/man/man1/gjavah.1*
+  rm -f $pkgdir/usr/share/man/man1/gkeytool.1*
+  rm -f $pkgdir/usr/share/man/man1/gnative2ascii.1*
+  rm -f $pkgdir/usr/share/man/man1/gorbd.1*
+  rm -f $pkgdir/usr/share/man/man1/grmid.1*
+  rm -f $pkgdir/usr/share/man/man1/grmiregistry.1*
+  rm -f $pkgdir/usr/share/man/man1/gserialver.1*
+  rm -f $pkgdir/usr/share/man/man1/gtnameserv.1*
+  rm -f $pkgdir/usr/share/info/dir
+}

Copied: classpath/repos/community-x86_64/freetype2_include.patch (from rev 107052, classpath/trunk/freetype2_include.patch)
===================================================================
--- community-x86_64/freetype2_include.patch	                        (rev 0)
+++ community-x86_64/freetype2_include.patch	2014-03-11 21:10:27 UTC (rev 107053)
@@ -0,0 +1,34 @@
+diff -aur classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
+--- classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	2008-12-18 01:43:41.000000000 +0100
++++ classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	2014-03-11 22:03:55.888827143 +0100
+@@ -42,8 +42,9 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #include "jcl.h"
+ #include "gdkfont.h"
+ #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
+diff -aur classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
+--- classpath-0.98/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	2007-04-25 16:53:04.000000000 +0200
++++ classpath-0.98.new/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	2014-03-11 22:03:18.788834707 +0100
+@@ -39,10 +39,11 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttypes.h>
+-#include <freetype/tttables.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TYPES_H
++#include FT_TRUETYPE_TABLES_H
+ #include "gdkfont.h"
+ #include "gtkpeer.h"
+ #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"




More information about the arch-commits mailing list