[arch-commits] Commit in icedtea-web-java7/repos (10 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sun Dec 25 14:20:06 UTC 2011
Date: Sunday, December 25, 2011 @ 09:20:05
Author: andyrtr
Revision: 145639
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
icedtea-web-java7/repos/extra-i686/PKGBUILD
(from rev 145638, icedtea-web-java7/trunk/PKGBUILD)
icedtea-web-java7/repos/extra-i686/icedtea-web-java7.install
(from rev 145638, icedtea-web-java7/trunk/icedtea-web-java7.install)
icedtea-web-java7/repos/extra-x86_64/PKGBUILD
(from rev 145638, icedtea-web-java7/trunk/PKGBUILD)
icedtea-web-java7/repos/extra-x86_64/icedtea-web-java7.install
(from rev 145638, icedtea-web-java7/trunk/icedtea-web-java7.install)
Deleted:
icedtea-web-java7/repos/extra-i686/PKGBUILD
icedtea-web-java7/repos/extra-i686/icedtea-web-1.1.4-npapi-fix.patch
icedtea-web-java7/repos/extra-i686/icedtea-web-java7.install
icedtea-web-java7/repos/extra-x86_64/PKGBUILD
icedtea-web-java7/repos/extra-x86_64/icedtea-web-1.1.4-npapi-fix.patch
icedtea-web-java7/repos/extra-x86_64/icedtea-web-java7.install
------------------------------------------------+
extra-i686/PKGBUILD | 176 ++++++++++-------------
extra-i686/icedtea-web-1.1.4-npapi-fix.patch | 12 -
extra-i686/icedtea-web-java7.install | 22 +-
extra-x86_64/PKGBUILD | 176 ++++++++++-------------
extra-x86_64/icedtea-web-1.1.4-npapi-fix.patch | 12 -
extra-x86_64/icedtea-web-java7.install | 22 +-
6 files changed, 178 insertions(+), 242 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-12-25 14:19:28 UTC (rev 145638)
+++ extra-i686/PKGBUILD 2011-12-25 14:20:05 UTC (rev 145639)
@@ -1,98 +0,0 @@
-# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=icedtea-web-java7
-pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.1.4
-#_date=20110925
-#pkgrel=0.${_date}.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org/wiki/IcedTea-Web"
-license=('GPL2')
-makedepends=('jdk7-openjdk' 'zip' 'xulrunner')
-source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz
- http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz
- #http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz
- icedtea-web-1.1.4-npapi-fix.patch)
-md5sums=('1ed24b7e58da26471187dfae80b020b6'
- '81ac36e05ea1b55f1580bdb28c24f4db')
-_javaver=7
-_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-mksource() {
- mkdir /tmp/${pkgbase}-${_date}
- pushd /tmp/${pkgbase}-${_date}
- hg clone http://icedtea.classpath.org/hg/icedtea-web ${pkgbase}-${_date}
- rm -rf ${pkgbase}-${_date}/.hg*
- tar -cvJf /tmp/${pkgbase}-${_date}/${pkgbase}-${_date}.tar.xz *
- popd
-}
-
-build() {
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
-
- . /etc/profile.d/jre.sh
- . /etc/profile.d/jdk.sh
-
- #autoreconf --force --install
-
- # fix build with Xulrunner 8
- patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch
-
- ./configure --prefix=${_jvmdir} \
- --datarootdir=/usr/share \
- --with-jdk-home=${_jvmdir}
- make
-}
-
-check() {
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
- make -k check
-}
-
-
-package_icedtea-web-java7() {
-
- pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
- depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
- install=${pkgname}.install
-
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
- # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
- make DESTDIR="${pkgdir}" install-exec-local install-data-local
-
- # Install desktop files.
- install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
- install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
- install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
- # remove splitted doc files
- rm -rf ${pkgdir}/usr/share/doc
-
- # link binaries into /usr/bin + jre/bin
- install -m755 -d ${pkgdir}/usr/bin
- install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
- pushd ${pkgdir}/${_jvmdir}/bin
- for file in *; do
- ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
- ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
- done
- popd
-
- # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
- install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
- ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
-}
-
-package_icedtea-web-java7-doc() {
-
- pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
-
- cd "${srcdir}"/icedtea-web* #${pkgbase}-${_date}"
-# install -m755 -d ${pkgdir}/${_jvmdir}/jre/lib
- make DESTDIR="${pkgdir}" install-data-local
- # remove javaws about and man page
- rm -rf ${pkgdir}/usr/lib
- rm -rf ${pkgdir}/usr/share/man
- rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
-}
Copied: icedtea-web-java7/repos/extra-i686/PKGBUILD (from rev 145638, icedtea-web-java7/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-25 14:20:05 UTC (rev 145639)
@@ -0,0 +1,78 @@
+# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=icedtea-web-java7
+pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
+pkgver=1.1.4
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://icedtea.classpath.org/wiki/IcedTea-Web"
+license=('GPL2')
+makedepends=('jdk7-openjdk' 'zip' 'gtk' 'npapi-sdk' 'rhino' 'junit')
+source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
+md5sums=('1ed24b7e58da26471187dfae80b020b6')
+
+_javaver=7
+_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+build() {
+ cd "${srcdir}"/icedtea-web*
+
+ . /etc/profile.d/jre.sh
+ . /etc/profile.d/jdk.sh
+
+ ./configure --prefix=${_jvmdir} \
+ --datarootdir=/usr/share \
+ --with-jdk-home=${_jvmdir}
+ make
+}
+
+check() {
+ cd "${srcdir}"/icedtea-web*
+ make -k check
+}
+
+
+package_icedtea-web-java7() {
+
+ pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
+ depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
+ install=${pkgname}.install
+
+ cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
+ # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
+ make DESTDIR="${pkgdir}" install-exec-local install-data-local
+
+ # Install desktop files.
+ install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
+ install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
+ install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
+ # remove splitted doc files
+ rm -rf ${pkgdir}/usr/share/doc
+
+ # link binaries into /usr/bin + jre/bin
+ install -m755 -d ${pkgdir}/usr/bin
+ install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
+ pushd ${pkgdir}/${_jvmdir}/bin
+ for file in *; do
+ ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
+ ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
+ done
+ popd
+
+ # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
+ install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
+ ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
+}
+
+package_icedtea-web-java7-doc() {
+
+ pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
+
+ cd "${srcdir}"/icedtea-web*
+ make DESTDIR="${pkgdir}" install-data-local
+ # remove javaws about and man page
+ rm -rf ${pkgdir}/usr/lib
+ rm -rf ${pkgdir}/usr/share/man
+ rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
+}
Deleted: extra-i686/icedtea-web-1.1.4-npapi-fix.patch
===================================================================
--- extra-i686/icedtea-web-1.1.4-npapi-fix.patch 2011-12-25 14:19:28 UTC (rev 145638)
+++ extra-i686/icedtea-web-1.1.4-npapi-fix.patch 2011-12-25 14:20:05 UTC (rev 145639)
@@ -1,12 +0,0 @@
-diff -up ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav ./plugin/icedteanp/IcedTeaNPPlugin.cc
---- ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav 2011-11-08 17:27:29.046520865 -0500
-+++ ./plugin/icedteanp/IcedTeaNPPlugin.cc 2011-11-08 17:27:40.469611421 -0500
-@@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT
-
- // Returns a string describing the MIME type that this plugin
- // handles.
--char*
-+const char*
- NP_GetMIMEDescription ()
- {
- PLUGIN_DEBUG ("NP_GetMIMEDescription\n");
Deleted: extra-i686/icedtea-web-java7.install
===================================================================
--- extra-i686/icedtea-web-java7.install 2011-12-25 14:19:28 UTC (rev 145638)
+++ extra-i686/icedtea-web-java7.install 2011-12-25 14:20:05 UTC (rev 145639)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- update-desktop-database -q
-}
-
-post_remove() {
- update-desktop-database -q
-}
Copied: icedtea-web-java7/repos/extra-i686/icedtea-web-java7.install (from rev 145638, icedtea-web-java7/trunk/icedtea-web-java7.install)
===================================================================
--- extra-i686/icedtea-web-java7.install (rev 0)
+++ extra-i686/icedtea-web-java7.install 2011-12-25 14:20:05 UTC (rev 145639)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-12-25 14:19:28 UTC (rev 145638)
+++ extra-x86_64/PKGBUILD 2011-12-25 14:20:05 UTC (rev 145639)
@@ -1,98 +0,0 @@
-# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=icedtea-web-java7
-pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.1.4
-#_date=20110925
-#pkgrel=0.${_date}.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org/wiki/IcedTea-Web"
-license=('GPL2')
-makedepends=('jdk7-openjdk' 'zip' 'xulrunner')
-source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz
- http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz
- #http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz
- icedtea-web-1.1.4-npapi-fix.patch)
-md5sums=('1ed24b7e58da26471187dfae80b020b6'
- '81ac36e05ea1b55f1580bdb28c24f4db')
-_javaver=7
-_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-mksource() {
- mkdir /tmp/${pkgbase}-${_date}
- pushd /tmp/${pkgbase}-${_date}
- hg clone http://icedtea.classpath.org/hg/icedtea-web ${pkgbase}-${_date}
- rm -rf ${pkgbase}-${_date}/.hg*
- tar -cvJf /tmp/${pkgbase}-${_date}/${pkgbase}-${_date}.tar.xz *
- popd
-}
-
-build() {
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
-
- . /etc/profile.d/jre.sh
- . /etc/profile.d/jdk.sh
-
- #autoreconf --force --install
-
- # fix build with Xulrunner 8
- patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch
-
- ./configure --prefix=${_jvmdir} \
- --datarootdir=/usr/share \
- --with-jdk-home=${_jvmdir}
- make
-}
-
-check() {
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
- make -k check
-}
-
-
-package_icedtea-web-java7() {
-
- pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
- depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
- install=${pkgname}.install
-
- cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
- # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
- make DESTDIR="${pkgdir}" install-exec-local install-data-local
-
- # Install desktop files.
- install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
- install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
- install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
- # remove splitted doc files
- rm -rf ${pkgdir}/usr/share/doc
-
- # link binaries into /usr/bin + jre/bin
- install -m755 -d ${pkgdir}/usr/bin
- install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
- pushd ${pkgdir}/${_jvmdir}/bin
- for file in *; do
- ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
- ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
- done
- popd
-
- # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
- install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
- ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
-}
-
-package_icedtea-web-java7-doc() {
-
- pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
-
- cd "${srcdir}"/icedtea-web* #${pkgbase}-${_date}"
-# install -m755 -d ${pkgdir}/${_jvmdir}/jre/lib
- make DESTDIR="${pkgdir}" install-data-local
- # remove javaws about and man page
- rm -rf ${pkgdir}/usr/lib
- rm -rf ${pkgdir}/usr/share/man
- rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
-}
Copied: icedtea-web-java7/repos/extra-x86_64/PKGBUILD (from rev 145638, icedtea-web-java7/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-12-25 14:20:05 UTC (rev 145639)
@@ -0,0 +1,78 @@
+# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=icedtea-web-java7
+pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
+pkgver=1.1.4
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://icedtea.classpath.org/wiki/IcedTea-Web"
+license=('GPL2')
+makedepends=('jdk7-openjdk' 'zip' 'gtk' 'npapi-sdk' 'rhino' 'junit')
+source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
+md5sums=('1ed24b7e58da26471187dfae80b020b6')
+
+_javaver=7
+_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+build() {
+ cd "${srcdir}"/icedtea-web*
+
+ . /etc/profile.d/jre.sh
+ . /etc/profile.d/jdk.sh
+
+ ./configure --prefix=${_jvmdir} \
+ --datarootdir=/usr/share \
+ --with-jdk-home=${_jvmdir}
+ make
+}
+
+check() {
+ cd "${srcdir}"/icedtea-web*
+ make -k check
+}
+
+
+package_icedtea-web-java7() {
+
+ pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
+ depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
+ install=${pkgname}.install
+
+ cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
+ # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
+ make DESTDIR="${pkgdir}" install-exec-local install-data-local
+
+ # Install desktop files.
+ install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
+ install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
+ install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
+ # remove splitted doc files
+ rm -rf ${pkgdir}/usr/share/doc
+
+ # link binaries into /usr/bin + jre/bin
+ install -m755 -d ${pkgdir}/usr/bin
+ install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
+ pushd ${pkgdir}/${_jvmdir}/bin
+ for file in *; do
+ ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
+ ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
+ done
+ popd
+
+ # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
+ install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
+ ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
+}
+
+package_icedtea-web-java7-doc() {
+
+ pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
+
+ cd "${srcdir}"/icedtea-web*
+ make DESTDIR="${pkgdir}" install-data-local
+ # remove javaws about and man page
+ rm -rf ${pkgdir}/usr/lib
+ rm -rf ${pkgdir}/usr/share/man
+ rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
+}
Deleted: extra-x86_64/icedtea-web-1.1.4-npapi-fix.patch
===================================================================
--- extra-x86_64/icedtea-web-1.1.4-npapi-fix.patch 2011-12-25 14:19:28 UTC (rev 145638)
+++ extra-x86_64/icedtea-web-1.1.4-npapi-fix.patch 2011-12-25 14:20:05 UTC (rev 145639)
@@ -1,12 +0,0 @@
-diff -up ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav ./plugin/icedteanp/IcedTeaNPPlugin.cc
---- ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav 2011-11-08 17:27:29.046520865 -0500
-+++ ./plugin/icedteanp/IcedTeaNPPlugin.cc 2011-11-08 17:27:40.469611421 -0500
-@@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT
-
- // Returns a string describing the MIME type that this plugin
- // handles.
--char*
-+const char*
- NP_GetMIMEDescription ()
- {
- PLUGIN_DEBUG ("NP_GetMIMEDescription\n");
Deleted: extra-x86_64/icedtea-web-java7.install
===================================================================
--- extra-x86_64/icedtea-web-java7.install 2011-12-25 14:19:28 UTC (rev 145638)
+++ extra-x86_64/icedtea-web-java7.install 2011-12-25 14:20:05 UTC (rev 145639)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- update-desktop-database -q
-}
-
-post_remove() {
- update-desktop-database -q
-}
Copied: icedtea-web-java7/repos/extra-x86_64/icedtea-web-java7.install (from rev 145638, icedtea-web-java7/trunk/icedtea-web-java7.install)
===================================================================
--- extra-x86_64/icedtea-web-java7.install (rev 0)
+++ extra-x86_64/icedtea-web-java7.install 2011-12-25 14:20:05 UTC (rev 145639)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
More information about the arch-commits
mailing list