[arch-commits] Commit in classpath/repos/community-x86_64 (4 files)
Balló György
bgyorgy at archlinux.org
Sun Sep 9 06:29:40 UTC 2018
Date: Sunday, September 9, 2018 @ 06:29:40
Author: bgyorgy
Revision: 378865
archrelease: copy trunk to community-x86_64
Added:
classpath/repos/community-x86_64/PKGBUILD
(from rev 378864, classpath/trunk/PKGBUILD)
classpath/repos/community-x86_64/freetype2_include.patch
(from rev 378864, classpath/trunk/freetype2_include.patch)
Deleted:
classpath/repos/community-x86_64/PKGBUILD
classpath/repos/community-x86_64/freetype2_include.patch
-------------------------+
PKGBUILD | 155 +++++++++++++++++++++++-----------------------
freetype2_include.patch | 68 ++++++++++----------
2 files changed, 113 insertions(+), 110 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-09-09 06:29:34 UTC (rev 378864)
+++ PKGBUILD 2018-09-09 06:29:40 UTC (rev 378865)
@@ -1,76 +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.99
-pkgrel=3
-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' 'antlr2')
-optdepends=('file' 'gconf')
-source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz
- freetype2_include.patch)
-md5sums=('0ae1571249172acd82488724a3b8acb4'
- '55dafc301c5f2e497696d01e9c1dab9c')
-
-prepare() {
- 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
-}
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --disable-Werror --disable-plugin \
- --with-antlr-jar=/usr/share/java/antlr2.jar
- 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/man/man1/gjdoc.1*
- rm -f $pkgdir/usr/share/info/dir
-}
Copied: classpath/repos/community-x86_64/PKGBUILD (from rev 378864, classpath/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-09-09 06:29:40 UTC (rev 378865)
@@ -0,0 +1,79 @@
+# $Id$
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: tardo <tardo at nagi-fanboi.net>
+# Contributor: Sean Gillespie <Sean.D.Gillespie at gmail.com>
+
+pkgname=classpath
+pkgver=0.99
+pkgrel=4
+pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
+arch=('x86_64')
+url="http://www.gnu.org/software/classpath/"
+license=('GPL')
+depends=('file' 'gtk2' 'libsm' 'libxtst')
+makedepends=('java-environment' 'antlr2')
+options=('!emptydirs')
+source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz
+ freetype2_include.patch)
+md5sums=('0ae1571249172acd82488724a3b8acb4'
+ '55dafc301c5f2e497696d01e9c1dab9c')
+
+prepare() {
+ 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
+
+ # fix build
+ sed -i 's/-source 1\.5 -target 1\.5/-source 1.6 -target 1.6/' configure m4/ac_prog_javac_works.m4 {examples,tools,lib}/Makefile.{am,in}
+}
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr --disable-Werror --disable-plugin --disable-gconf-peer \
+ --with-antlr-jar=/usr/share/java/antlr2.jar
+ 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/man/man1/gjdoc.1*
+ rm -f "$pkgdir"/usr/share/info/dir
+}
Deleted: freetype2_include.patch
===================================================================
--- freetype2_include.patch 2018-09-09 06:29:34 UTC (rev 378864)
+++ freetype2_include.patch 2018-09-09 06:29:40 UTC (rev 378865)
@@ -1,34 +0,0 @@
-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"
Copied: classpath/repos/community-x86_64/freetype2_include.patch (from rev 378864, classpath/trunk/freetype2_include.patch)
===================================================================
--- freetype2_include.patch (rev 0)
+++ freetype2_include.patch 2018-09-09 06:29:40 UTC (rev 378865)
@@ -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