archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-09-19 22:08:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

extra/java7-openjdk to 7.u45_2.4.3-1

Browse source
This commit is contained in:
Kevin Mihelich 2013-10-21 22:42:19 +00:00
parent c12a0a0b8d
commit e37ba42132
2 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
extra/java7-openjdk/PKGBUILD
View file

@ -10,27 +10,27 @@
# - added our architectures to set _JARCH # - added our architectures to set _JARCH
# - strip -D_FORTIFY_SOURCE=2 from C/CXXFLAGS # - strip -D_FORTIFY_SOURCE=2 from C/CXXFLAGS
noautobuild=1 #noautobuild=1
pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src')
pkgbase=java7-openjdk pkgbase=java7-openjdk
_java_ver=7 _java_ver=7
_updatever=u40 _icedtea_ver=2.4.3
_icedtea_ver=2.4.2
# check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
_CORBA_CHANGESET=5ea58899ae9f _JDK_UPDATE_VERSION=45
_JAXP_CHANGESET=135f46e0e653 _CORBA_CHANGESET=8ed5df839fbc
_JAXWS_CHANGESET=a2ff16e5361f _JAXP_CHANGESET=8f220f7b51c7
_JDK_CHANGESET=4bf5ac86e0e4 _JAXWS_CHANGESET=652eb396f959
_LANGTOOLS_CHANGESET=06ea051f7ffe _JDK_CHANGESET=7958751eb9ef
_OPENJDK_CHANGESET=6125b83238df _LANGTOOLS_CHANGESET=3c8eb52a32ea
_OPENJDK_CHANGESET=e2f5917da3c1
_HOTSPOT_CHANGESET=b732355257e3 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map _HOTSPOT_CHANGESET=b59e02d9e72b # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
_bootstrap=0 # 0/1 for quick build or full bootstrap _bootstrap=0 # 0/1 for quick build or full bootstrap
pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
pkgrel=1 pkgrel=1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://icedtea.classpath.org" url="http://icedtea.classpath.org"
@ -57,16 +57,16 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
jdk7-openjdk.profile.csh jdk7-openjdk.profile.csh
jre7-openjdk.profile jre7-openjdk.profile
jre7-openjdk.profile.csh) jre7-openjdk.profile.csh)
sha256sums=('3dab1edc5c0391bd67cfac60cbfb5c91aee6ea9726043252d9f216dfafd236b6' sha256sums=('15b1acc1fb43b83ca08d531491261c5eeaea4cad3598300074692acea93bdd3d'
'bc5703a7c31a6f1de53259768f613fa1f451d721d3301c58a59513dc3953d95b' '75a18abd117e3295c6de4d3450f0094a9abc08f2168e2911bce25d1e153107b9'
'41fc9041d7804bbd519290325c0a21b48405ed96ccf557037189b007391d33a8' '7fab9af64ffcdf635a6fed5abf78cffd1f64be1f3827a1aaf3a0e5e1fdbc599c'
'3e043ea822cf18232fb0897431a2c900c8d29dce59e33bd8e3236ed1ac6c8fde' 'cec41aebd42f4c8caba9c24c306ba78e8cf5da3d23da1604b98753340a2719ca'
'ac21931af93267188fb6dac8ed5eb44121e25e55fe432c19184c20c17cc9ceda' 'fb9c22e92c2a056917b7b5dce6905a01ab2e904cbc3c1c6badcc470d22136518'
'8cc46ef5d73a3a6445b411637fee5cc5f086e400d42b36f1f42eba4caee2a11a' '4df06346d197180bbb9d182e3ebc9ab6386562199d9898d057d0df75566349fe'
'd2de1d2e98ebea56d2367f0003e5f4b5031d55ed529a7c524df8eba9da08c735' '462ad61fd34708c90362f9e3d3c432b9246833ea8ff0d8a14955ae386bce4a91'
'4a4a04fa2c49d0a688400f6c9f129f47ba5cd931874c33254a047a1f36e6ac36' 'b7d7e01d7ab9e49b68aa29b55355a019d71f9ae5cabb4ea7378b55855a07df57'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea' 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
'3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8' 'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8'

26
extra/java7-openjdk/openjdk7_nonreparenting-wm.diff
View file

@ -1,16 +1,16 @@
--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200 --- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2013-10-16 16:17:14.000000000 +0200
+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200 +++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2013-10-21 20:57:34.768580842 +0200
@@ -103,7 +103,8 @@ @@ -105,7 +105,8 @@
COMPIZ_WM = 12,
LG3D_WM = 13, LG3D_WM = 13,
CWM_WM = 14, CWM_WM = 14,
- MUTTER_WM = 15; MUTTER_WM = 15,
+ MUTTER_WM = 15, - MARCO_WM = 16;
+ OTHER_NONREPARENTING_WM = 16; + MARCO_WM = 16,
+ OTHER_NONREPARENTING_WM = 17;
public String toString() { public String toString() {
switch (WMID) { switch (WMID) {
case NO_WM: case NO_WM:
@@ -583,7 +584,7 @@ @@ -591,7 +592,7 @@
// TODO: according to wikipedia, compiz is now reparenting. This should // TODO: according to wikipedia, compiz is now reparenting. This should
// probably be updated. // probably be updated.
static boolean isNonReparentingWM() { static boolean isNonReparentingWM() {
@ -19,7 +19,7 @@
} }
/* /*
@@ -771,9 +772,17 @@ @@ -781,9 +782,17 @@
* supports WIN or _NET wm spec. * supports WIN or _NET wm spec.
*/ */
else if (l_net_protocol.active()) { else if (l_net_protocol.active()) {
@ -28,18 +28,18 @@
+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
+ } else { + } else {
+ awt_wmgr = XWM.OTHER_WM; + awt_wmgr = XWM.OTHER_WM;
+ } + }
} else if (win.active()) { } else if (win.active()) {
- awt_wmgr = XWM.OTHER_WM; - awt_wmgr = XWM.OTHER_WM;
+ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { + if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
+ } else { + } else {
+ awt_wmgr = XWM.OTHER_WM; + awt_wmgr = XWM.OTHER_WM;
+ } + }
} }
/* /*
* Check for legacy WMs. * Check for legacy WMs.
@@ -784,6 +793,8 @@ @@ -794,6 +803,8 @@
awt_wmgr = XWM.MOTIF_WM; awt_wmgr = XWM.MOTIF_WM;
} else if (isOpenLook()) { } else if (isOpenLook()) {
awt_wmgr = XWM.OPENLOOK_WM; awt_wmgr = XWM.OPENLOOK_WM;
@ -48,7 +48,7 @@
} else { } else {
awt_wmgr = XWM.OTHER_WM; awt_wmgr = XWM.OTHER_WM;
} }
@@ -1298,6 +1309,7 @@ @@ -1309,6 +1320,7 @@
res = new Insets(28, 6, 6, 6); res = new Insets(28, 6, 6, 6);
break; break;
case NO_WM: case NO_WM: