[arch-commits] Commit in swt/repos (8 files)

Jan Steffens heftig at archlinux.org
Thu Feb 9 09:00:20 UTC 2017


    Date: Thursday, February 9, 2017 @ 09:00:19
  Author: heftig
Revision: 288282

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

Added:
  swt/repos/extra-i686/PKGBUILD
    (from rev 288281, swt/trunk/PKGBUILD)
  swt/repos/extra-i686/build-swt.xml
    (from rev 288281, swt/trunk/build-swt.xml)
  swt/repos/extra-x86_64/PKGBUILD
    (from rev 288281, swt/trunk/PKGBUILD)
  swt/repos/extra-x86_64/build-swt.xml
    (from rev 288281, swt/trunk/build-swt.xml)
Deleted:
  swt/repos/extra-i686/PKGBUILD
  swt/repos/extra-i686/build-swt.xml
  swt/repos/extra-x86_64/PKGBUILD
  swt/repos/extra-x86_64/build-swt.xml

----------------------------+
 /PKGBUILD                  |  102 +++++++++++++++++++++++++++++++++++++++++++
 /build-swt.xml             |   34 ++++++++++++++
 extra-i686/PKGBUILD        |   56 -----------------------
 extra-i686/build-swt.xml   |   17 -------
 extra-x86_64/PKGBUILD      |   56 -----------------------
 extra-x86_64/build-swt.xml |   17 -------
 6 files changed, 136 insertions(+), 146 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-02-09 08:51:48 UTC (rev 288281)
+++ extra-i686/PKGBUILD	2017-02-09 09:00:19 UTC (rev 288282)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-pkgname=swt
-# http://download.eclipse.org/eclipse/downloads/drops4
-pkgver=4.6.2
-pkgrel=2
-_date=201611241400
-pkgdesc='An open source widget toolkit for Java'
-arch=('i686' 'x86_64')
-url='http://www.eclipse.org/swt/'
-license=('EPL')
-depends=('java-runtime>=7' 'gtk2>=2.20.1' 'libxtst')
-optdepends=('glu' 'webkitgtk2')
-makedepends=('java-environment=8' 'libxtst' 'glu' 'unzip' 'pkgconfig' 'webkitgtk2' 'apache-ant')
-source=(build-swt.xml)
-source_i686=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip)
-source_x86_64=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip)
-sha256sums=('3d30fbde25a6a6d260d04cb1782b7618c2a0a926440935a9eea516146eb0e1e1')
-sha256sums_i686=('5db81a94b3720e0b7008c52c2f90d8db9b8f8770e2f9ce981c16f284a47f263b')
-sha256sums_x86_64=('3315827460e3bbb44812ed7639743ae42886c48c96c44dd06d8d4c319f5f7d50')
-
-
-# These examples don't even run anymore (Try Tux Guitar instead)!
-# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
-# http://download.eclipse.org/eclipse/downloads/
-
-# http://mirror.ibcp.fr/pub/eclipse/eclipse/downloads/drops4/R-4.4-201406061215/org.eclipse.sdk.examples.source-4.4.zip
-
-build() {
-  cd ${srcdir}
-  unzip -oq src.zip -d src
-
-  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
-
-  # Shared objects
-  cd src
-  ./build.sh
-
-  # SWT jar
-  . /etc/profile.d/apache-ant.sh
-  ant -f ../build-swt.xml compile
-  ant -f ../build-swt.xml jar
-}
-
-package() {
-  cd ${srcdir}/src
-
-  # Shared objects
-  export OUTPUT_DIR=${pkgdir}/usr/lib
-  install -dm755 ${OUTPUT_DIR} 
-  make -f make_linux.mak install
-
-  # SWT jar
-  install -Dm755 ../swt.jar ${pkgdir}/usr/share/java/swt-${pkgver}.jar
-  ln -s swt-${pkgver}.jar ${pkgdir}/usr/share/java/swt.jar
-}

Copied: swt/repos/extra-i686/PKGBUILD (from rev 288281, swt/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-02-09 09:00:19 UTC (rev 288282)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+pkgname=swt
+# http://download.eclipse.org/eclipse/downloads/drops4
+pkgver=4.6.2
+pkgrel=3
+_date=201611241400
+pkgdesc='An open source widget toolkit for Java'
+arch=('i686' 'x86_64')
+url='http://www.eclipse.org/swt/'
+license=('EPL')
+depends=('java-runtime>=7' 'libxtst')
+makedepends=('jdk8-openjdk' 'glu' 'unzip' 'pkgconfig' 'gtk2' 'gtk3' 'apache-ant')
+optdepends=('glu' 'gtk2' 'gtk3')
+
+# Source isn't distributed separately from the binaries; we're not using the latter
+source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
+        build-swt.xml)
+sha256sums=('3315827460e3bbb44812ed7639743ae42886c48c96c44dd06d8d4c319f5f7d50'
+            '3d30fbde25a6a6d260d04cb1782b7618c2a0a926440935a9eea516146eb0e1e1')
+
+# These examples don't even run anymore (Try Tux Guitar instead)!
+# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
+# http://download.eclipse.org/eclipse/downloads/
+
+# http://mirror.ibcp.fr/pub/eclipse/eclipse/downloads/drops4/R-4.4-201406061215/org.eclipse.sdk.examples.source-4.4.zip
+
+build() {
+  unzip -oq src.zip -d src
+
+  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
+
+  # SWT jar
+  . /etc/profile.d/apache-ant.sh
+  ant -f build-swt.xml compile
+  ant -f build-swt.xml jar
+
+  # Not building shared objects here as -gtk-all clobbers
+}
+
+package() {
+  cd src
+
+  # SWT jar
+  install -Dm644 ../swt.jar "$pkgdir/usr/share/java/swt-$pkgver.jar"
+  ln -s swt-$pkgver.jar "$pkgdir/usr/share/java/swt.jar"
+
+  # Shared objects
+  install -d "$pkgdir/usr/lib"
+  OUTPUT_DIR="$pkgdir/usr/lib" ./build.sh -gtk-all install
+}

Deleted: extra-i686/build-swt.xml
===================================================================
--- extra-i686/build-swt.xml	2017-02-09 08:51:48 UTC (rev 288281)
+++ extra-i686/build-swt.xml	2017-02-09 09:00:19 UTC (rev 288282)
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
-   <property name="src" location="."/>
-   <property name="build" location="build"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-   </target>
-
-   <target name="compile" depends="init" description="Compile the SWT toolset">
-      <javac srcdir="${src}" destdir="${build}" source="1.7" />
-   </target>
-
-   <target name="jar">
-      <jar destfile="swt.jar" basedir="${build}"/>
-   </target>
-</project>

Copied: swt/repos/extra-i686/build-swt.xml (from rev 288281, swt/trunk/build-swt.xml)
===================================================================
--- extra-i686/build-swt.xml	                        (rev 0)
+++ extra-i686/build-swt.xml	2017-02-09 09:00:19 UTC (rev 288282)
@@ -0,0 +1,17 @@
+<project name="SWT" default="jar" basedir=".">
+   <property name="src" location="."/>
+   <property name="build" location="build"/>
+
+   <target name="init">
+      <tstamp/>
+      <mkdir dir="${build}"/>
+   </target>
+
+   <target name="compile" depends="init" description="Compile the SWT toolset">
+      <javac srcdir="${src}" destdir="${build}" source="1.7" />
+   </target>
+
+   <target name="jar">
+      <jar destfile="swt.jar" basedir="${build}"/>
+   </target>
+</project>

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-02-09 08:51:48 UTC (rev 288281)
+++ extra-x86_64/PKGBUILD	2017-02-09 09:00:19 UTC (rev 288282)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-pkgname=swt
-# http://download.eclipse.org/eclipse/downloads/drops4
-pkgver=4.6.2
-pkgrel=2
-_date=201611241400
-pkgdesc='An open source widget toolkit for Java'
-arch=('i686' 'x86_64')
-url='http://www.eclipse.org/swt/'
-license=('EPL')
-depends=('java-runtime>=7' 'gtk2>=2.20.1' 'libxtst')
-optdepends=('glu' 'webkitgtk2')
-makedepends=('java-environment=8' 'libxtst' 'glu' 'unzip' 'pkgconfig' 'webkitgtk2' 'apache-ant')
-source=(build-swt.xml)
-source_i686=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip)
-source_x86_64=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip)
-sha256sums=('3d30fbde25a6a6d260d04cb1782b7618c2a0a926440935a9eea516146eb0e1e1')
-sha256sums_i686=('5db81a94b3720e0b7008c52c2f90d8db9b8f8770e2f9ce981c16f284a47f263b')
-sha256sums_x86_64=('3315827460e3bbb44812ed7639743ae42886c48c96c44dd06d8d4c319f5f7d50')
-
-
-# These examples don't even run anymore (Try Tux Guitar instead)!
-# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
-# http://download.eclipse.org/eclipse/downloads/
-
-# http://mirror.ibcp.fr/pub/eclipse/eclipse/downloads/drops4/R-4.4-201406061215/org.eclipse.sdk.examples.source-4.4.zip
-
-build() {
-  cd ${srcdir}
-  unzip -oq src.zip -d src
-
-  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
-
-  # Shared objects
-  cd src
-  ./build.sh
-
-  # SWT jar
-  . /etc/profile.d/apache-ant.sh
-  ant -f ../build-swt.xml compile
-  ant -f ../build-swt.xml jar
-}
-
-package() {
-  cd ${srcdir}/src
-
-  # Shared objects
-  export OUTPUT_DIR=${pkgdir}/usr/lib
-  install -dm755 ${OUTPUT_DIR} 
-  make -f make_linux.mak install
-
-  # SWT jar
-  install -Dm755 ../swt.jar ${pkgdir}/usr/share/java/swt-${pkgver}.jar
-  ln -s swt-${pkgver}.jar ${pkgdir}/usr/share/java/swt.jar
-}

Copied: swt/repos/extra-x86_64/PKGBUILD (from rev 288281, swt/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-02-09 09:00:19 UTC (rev 288282)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+pkgname=swt
+# http://download.eclipse.org/eclipse/downloads/drops4
+pkgver=4.6.2
+pkgrel=3
+_date=201611241400
+pkgdesc='An open source widget toolkit for Java'
+arch=('i686' 'x86_64')
+url='http://www.eclipse.org/swt/'
+license=('EPL')
+depends=('java-runtime>=7' 'libxtst')
+makedepends=('jdk8-openjdk' 'glu' 'unzip' 'pkgconfig' 'gtk2' 'gtk3' 'apache-ant')
+optdepends=('glu' 'gtk2' 'gtk3')
+
+# Source isn't distributed separately from the binaries; we're not using the latter
+source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
+        build-swt.xml)
+sha256sums=('3315827460e3bbb44812ed7639743ae42886c48c96c44dd06d8d4c319f5f7d50'
+            '3d30fbde25a6a6d260d04cb1782b7618c2a0a926440935a9eea516146eb0e1e1')
+
+# These examples don't even run anymore (Try Tux Guitar instead)!
+# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
+# http://download.eclipse.org/eclipse/downloads/
+
+# http://mirror.ibcp.fr/pub/eclipse/eclipse/downloads/drops4/R-4.4-201406061215/org.eclipse.sdk.examples.source-4.4.zip
+
+build() {
+  unzip -oq src.zip -d src
+
+  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
+
+  # SWT jar
+  . /etc/profile.d/apache-ant.sh
+  ant -f build-swt.xml compile
+  ant -f build-swt.xml jar
+
+  # Not building shared objects here as -gtk-all clobbers
+}
+
+package() {
+  cd src
+
+  # SWT jar
+  install -Dm644 ../swt.jar "$pkgdir/usr/share/java/swt-$pkgver.jar"
+  ln -s swt-$pkgver.jar "$pkgdir/usr/share/java/swt.jar"
+
+  # Shared objects
+  install -d "$pkgdir/usr/lib"
+  OUTPUT_DIR="$pkgdir/usr/lib" ./build.sh -gtk-all install
+}

Deleted: extra-x86_64/build-swt.xml
===================================================================
--- extra-x86_64/build-swt.xml	2017-02-09 08:51:48 UTC (rev 288281)
+++ extra-x86_64/build-swt.xml	2017-02-09 09:00:19 UTC (rev 288282)
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
-   <property name="src" location="."/>
-   <property name="build" location="build"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-   </target>
-
-   <target name="compile" depends="init" description="Compile the SWT toolset">
-      <javac srcdir="${src}" destdir="${build}" source="1.7" />
-   </target>
-
-   <target name="jar">
-      <jar destfile="swt.jar" basedir="${build}"/>
-   </target>
-</project>

Copied: swt/repos/extra-x86_64/build-swt.xml (from rev 288281, swt/trunk/build-swt.xml)
===================================================================
--- extra-x86_64/build-swt.xml	                        (rev 0)
+++ extra-x86_64/build-swt.xml	2017-02-09 09:00:19 UTC (rev 288282)
@@ -0,0 +1,17 @@
+<project name="SWT" default="jar" basedir=".">
+   <property name="src" location="."/>
+   <property name="build" location="build"/>
+
+   <target name="init">
+      <tstamp/>
+      <mkdir dir="${build}"/>
+   </target>
+
+   <target name="compile" depends="init" description="Compile the SWT toolset">
+      <javac srcdir="${src}" destdir="${build}" source="1.7" />
+   </target>
+
+   <target name="jar">
+      <jar destfile="swt.jar" basedir="${build}"/>
+   </target>
+</project>



More information about the arch-commits mailing list