[arch-commits] Commit in java7-openjdk/trunk (3 files)

[Guillaume Alaux]

    Date: Tuesday, June 18, 2013 @ 20:57:18
  Author: guillaume
Revision: 188736

Removed path fixing patches

Modified:
  java7-openjdk/trunk/PKGBUILD
Deleted:
  java7-openjdk/trunk/01_fix_openjdk_cmds_path.diff
  java7-openjdk/trunk/02_fix_corba_cmds_path.diff

-------------------------------+
 01_fix_openjdk_cmds_path.diff |   39 ---------------------------------------
 02_fix_corba_cmds_path.diff   |   32 --------------------------------
 PKGBUILD                      |    6 ------
 3 files changed, 77 deletions(-)

Deleted: 01_fix_openjdk_cmds_path.diff
===================================================================
--- 01_fix_openjdk_cmds_path.diff	2013-06-18 17:08:27 UTC (rev 188735)
+++ 01_fix_openjdk_cmds_path.diff	2013-06-18 18:57:18 UTC (rev 188736)
@@ -1,39 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.orig	2013-05-19 20:01:25.676093296 +0000
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2013-05-19 20:01:54.312572109 +0000
-@@ -98,9 +98,9 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
--CPIO           = $(UTILS_COMMAND_PATH)cpio
-+CPIO           = $(UTILS_USR_BIN_PATH)cpio
- CUT            = $(UTILS_USR_BIN_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
-@@ -108,13 +108,13 @@
- DIRNAME        = $(UTILS_USR_BIN_PATH)dirname
- DUMP           = $(UTILS_CCS_BIN_PATH)dump
- ECHO           = $(UTILS_COMMAND_PATH)echo
--EGREP          = $(UTILS_COMMAND_PATH)egrep
-+EGREP          = $(UTILS_USR_BIN_PATH)egrep
- EXPR           = $(UTILS_USR_BIN_PATH)expr
- FILE           = $(UTILS_USR_BIN_PATH)file
- FIND           = $(UTILS_USR_BIN_PATH)find
- FMT            = $(UTILS_COMMAND_PATH)fmt
- GDB            = $(UTILS_USR_BIN_PATH)gdb
--GREP           = $(UTILS_COMMAND_PATH)grep
-+GREP           = $(UTILS_USR_BIN_PATH)grep
- GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
- # GZIP is used for solaris. Linux and windows use tar czf
- GZIP           = $(UTILS_COMMAND_PATH)gzip
-@@ -148,7 +148,7 @@
- TAIL           = $(UTILS_USR_BIN_PATH)tail
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
--TOUCH          = $(UTILS_COMMAND_PATH)touch
-+TOUCH          = $(UTILS_USR_BIN_PATH)touch
- TR             = $(UTILS_USR_BIN_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname

Deleted: 02_fix_corba_cmds_path.diff
===================================================================
--- 02_fix_corba_cmds_path.diff	2013-06-18 17:08:27 UTC (rev 188735)
+++ 02_fix_corba_cmds_path.diff	2013-06-18 18:57:18 UTC (rev 188736)
@@ -1,32 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.orig	2013-05-19 19:57:58.530784147 +0000
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2013-05-19 19:58:44.777147938 +0000
-@@ -83,9 +83,9 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
--CPIO           = $(UTILS_COMMAND_PATH)cpio
-+CPIO           = $(UTILS_USR_BIN_PATH)cpio
- CUT            = $(UTILS_USR_BIN_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
-@@ -131,7 +131,7 @@
- TAIL           = $(UTILS_USR_BIN_PATH)tail
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
--TOUCH          = $(UTILS_COMMAND_PATH)touch
-+TOUCH          = $(UTILS_USR_BIN_PATH)touch
- TR             = $(UTILS_USR_BIN_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
-@@ -182,7 +182,7 @@
-   # others have it in /usr/bin.
-   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
-                    $(wildcard $(UTILS_USR_BIN_PATH)sort))
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-18 17:08:27 UTC (rev 188735)
+++ PKGBUILD	2013-06-18 18:57:18 UTC (rev 188736)
@@ -43,8 +43,6 @@
         ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz			# langtools.tar.gz
         ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz				# hotspot.tar.gz
         fontconfig-paths.diff
-        01_fix_openjdk_cmds_path.diff
-        02_fix_corba_cmds_path.diff
         openjdk7_nonreparenting-wm.diff
         jdk7-openjdk.profile
         jdk7-openjdk.profile.csh
@@ -59,8 +57,6 @@
             '80cbe75f7c268e97619e8007f8d29ecbbb7584062c1286c8b470f875526028f3'
             '34e60aba6db2f7a5cac7861058db283bd1edcdd9194a5490114cf76edd71696d'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '583af9025df545264a15665e4c9f981bc7286aaecc6d312dced485102cf5dda9'
-            'd57754ff320475023688bd7c7af38a9ea37e27ed8c1edd3b1572e4d8b41b78d3'
             'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
             'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
             '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
@@ -90,8 +86,6 @@
 
   cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
   export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
-                               patches/01_fix_openjdk_cmds_path.diff \
-                               patches/02_fix_corba_cmds_path.diff \
                                patches/openjdk7_nonreparenting-wm.diff"
 
   if [ "$_bootstrap" = "1" ]; then