[arch-commits] Commit in openjdk6/trunk (PKGBUILD aatext_by_default.diff)

[andyrtr at archlinux.org]

    Date: Saturday, June 4, 2011 @ 19:48:31
  Author: andyrtr
Revision: 126340

upgpkg: openjdk6 6.b22_1.10.1-2
aatext_by_default.diff is obsolet now for some time, code has gone upstream; FS#23619

Modified:
  openjdk6/trunk/PKGBUILD
Deleted:
  openjdk6/trunk/aatext_by_default.diff

------------------------+
 PKGBUILD               |    6 ++----
 aatext_by_default.diff |   35 -----------------------------------
 2 files changed, 2 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-04 22:38:48 UTC (rev 126339)
+++ PKGBUILD	2011-06-04 23:48:31 UTC (rev 126340)
@@ -11,7 +11,7 @@
 _openjdk_date=28_feb_2011
 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=2
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -27,7 +27,6 @@
 	https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip
 	fix_jdk_cmds_path.diff
 	fix_corba_cmds_path.diff
-	aatext_by_default.diff
 	fontconfig-paths.diff
 	nonreparenting-wm.diff
 	openjdk6.profile
@@ -40,7 +39,6 @@
          'bc95c133620bd68c161cac9891592901'
          '5da3e39fa60985576c4f37d1491efbe2'
          'f7e7a212e50abb56a6ef1a2b1bd27405'
-         'ef60d567c0d9bad111212851220deafd'
          'ee1afda124d5927345014ab382ef581e'
          '409812b5675f9678b1c9e1a12a945a9a'
          '74c4a7adc782edd087802bf92ae3d6d0'
@@ -76,7 +74,7 @@
 
   autoreconf -i
 
-  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff"
+  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff"
 
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"

Deleted: aatext_by_default.diff
===================================================================
--- aatext_by_default.diff	2011-06-04 22:38:48 UTC (rev 126339)
+++ aatext_by_default.diff	2011-06-04 23:48:31 UTC (rev 126340)
@@ -1,35 +0,0 @@
---- openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java.old	2008-01-08 20:23:56.000000000 +0200
-+++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java	2008-02-24 12:39:19.000000000 +0200
-@@ -1875,7 +1875,6 @@
-      */
-     private static boolean useSystemAAFontSettings() {
-         if (!checkedSystemAAFontSettings) {
--            useSystemAAFontSettings = true; /* initially set this true */
-             String systemAAFonts = null;
-             Toolkit tk = Toolkit.getDefaultToolkit();
-             if (tk instanceof SunToolkit) {
-@@ -1883,20 +1882,10 @@
-                     (String)AccessController.doPrivileged(
-                          new GetPropertyAction("awt.useSystemAAFontSettings"));
-             }
--            if (systemAAFonts != null) {
--                useSystemAAFontSettings =
--                    Boolean.valueOf(systemAAFonts).booleanValue();
--                /* If it is anything other than "true", then it may be
--                 * a hint name , or it may be "off, "default", etc.
--                 */
--                if (!useSystemAAFontSettings) {
--                    desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
--                }
--            }
--            /* If its still true, apply the extra condition */
--            if (useSystemAAFontSettings) {
--                 useSystemAAFontSettings = lastExtraCondition;
--            }
-+            if (systemAAFonts == null || Boolean.parseBoolean(systemAAFonts))
-+                systemAAFonts = "on";
-+            desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
-+            useSystemAAFontSettings = desktopFontHints != null;
-             checkedSystemAAFontSettings = true;
-         }
-         return useSystemAAFontSettings;