diff options
author | Mike Gilbert <floppym@gentoo.org> | 2012-05-06 19:40:21 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2012-05-06 19:40:21 +0000 |
commit | d5ef9a414c927137588669bb09c7ee86cc86e1c0 (patch) | |
tree | 5352bac0182f306e7d50d1e8bc63bf3b01f810a5 /dev-libs/icu/files | |
parent | eapi=4; vdr-plugin-2.eclass (diff) | |
download | gentoo-2-d5ef9a414c927137588669bb09c7ee86cc86e1c0.tar.gz gentoo-2-d5ef9a414c927137588669bb09c7ee86cc86e1c0.tar.bz2 gentoo-2-d5ef9a414c927137588669bb09c7ee86cc86e1c0.zip |
Remove old patches per Arfrever.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/icu/files')
-rw-r--r-- | dev-libs/icu/files/icu-4.6-pkgdata.patch | 98 | ||||
-rw-r--r-- | dev-libs/icu/files/icu-4.6.1-parallel_installation.patch | 32 | ||||
-rw-r--r-- | dev-libs/icu/files/icu-4.8.1-fix_ltr.patch | 56 |
3 files changed, 0 insertions, 186 deletions
diff --git a/dev-libs/icu/files/icu-4.6-pkgdata.patch b/dev-libs/icu/files/icu-4.6-pkgdata.patch deleted file mode 100644 index df9b4045fa0c..000000000000 --- a/dev-libs/icu/files/icu-4.6-pkgdata.patch +++ /dev/null @@ -1,98 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=326021 -https://ssl.icu-project.org/trac/ticket/8281 -https://ssl.icu-project.org/trac/changeset/29332 -https://ssl.icu-project.org/trac/changeset/29333 - ---- tools/pkgdata/pkgdata.cpp -+++ tools/pkgdata/pkgdata.cpp -@@ -1,5 +1,5 @@ - /****************************************************************************** -- * Copyright (C) 2000-2010, International Business Machines -+ * Copyright (C) 2000-2011, International Business Machines - * Corporation and others. All Rights Reserved. - ******************************************************************************* - * file name: pkgdata.c -@@ -99,6 +99,7 @@ - - #define LARGE_BUFFER_MAX_SIZE 2048 - #define SMALL_BUFFER_MAX_SIZE 512 -+#define BUFFER_PADDING_SIZE 20 - - static void loadLists(UPKGOptions *o, UErrorCode *status); - -@@ -484,9 +485,8 @@ - - if (!specialHandling) { - #if defined(USING_CYGWIN) || defined(OS400) --#define CMD_PADDING_SIZE 20 -- if ((len + CMD_PADDING_SIZE) >= SMALL_BUFFER_MAX_SIZE) { -- cmd = (char *)uprv_malloc(len + CMD_PADDING_SIZE); -+ if ((len + BUFFER_PADDING_SIZE) >= SMALL_BUFFER_MAX_SIZE) { -+ cmd = (char *)uprv_malloc(len + BUFFER_PADDING_SIZE); - } else { - cmd = cmdBuffer; - } -@@ -1133,6 +1133,7 @@ - int32_t result = 0; - char *cmd = NULL; - UBool freeCmd = FALSE; -+ int32_t length = 0; - - /* This is necessary because if packaging is done without assembly code, objectFile might be extremely large - * containing many object files and so the calling function should supply a command buffer that is large -@@ -1140,15 +1141,18 @@ - */ - if (command != NULL) { - cmd = command; -- } else { -- if ((cmd = (char *)uprv_malloc(sizeof(char) * LARGE_BUFFER_MAX_SIZE)) == NULL) { -- fprintf(stderr, "Unable to allocate memory for command.\n"); -- return -1; -- } -- freeCmd = TRUE; - } - - if (mode == MODE_STATIC) { -+ if (cmd == NULL) { -+ length = uprv_strlen(pkgDataFlags[AR]) + uprv_strlen(pkgDataFlags[ARFLAGS]) + uprv_strlen(targetDir) + -+ uprv_strlen(libFileNames[LIB_FILE_VERSION]) + uprv_strlen(objectFile) + uprv_strlen(pkgDataFlags[RANLIB]) + BUFFER_PADDING_SIZE; -+ if ((cmd = (char *)uprv_malloc(sizeof(char) * length)) == NULL) { -+ fprintf(stderr, "Unable to allocate memory for command.\n"); -+ return -1; -+ } -+ freeCmd = TRUE; -+ } - sprintf(cmd, "%s %s %s%s %s", - pkgDataFlags[AR], - pkgDataFlags[ARFLAGS], -@@ -1166,6 +1170,21 @@ - result = runCommand(cmd); - } - } else /* if (mode == MODE_DLL) */ { -+ if (cmd == NULL) { -+ length = uprv_strlen(pkgDataFlags[GENLIB]) + uprv_strlen(pkgDataFlags[LDICUDTFLAGS]) + -+ uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_VERSION_TMP]) + -+ uprv_strlen(objectFile) + uprv_strlen(pkgDataFlags[LD_SONAME]) + -+ uprv_strlen(pkgDataFlags[LD_SONAME][0] == 0 ? "" : libFileNames[LIB_FILE_VERSION_MAJOR]) + -+ uprv_strlen(pkgDataFlags[RPATH_FLAGS]) + uprv_strlen(pkgDataFlags[BIR_FLAGS]) + BUFFER_PADDING_SIZE; -+#ifdef U_CYGWIN -+ length += uprv_strlen(targetDir) + uprv_strlen(libFileNames[LIB_FILE_CYGWIN_VERSION]); -+#endif -+ if ((cmd = (char *)uprv_malloc(sizeof(char) * length)) == NULL) { -+ fprintf(stderr, "Unable to allocate memory for command.\n"); -+ return -1; -+ } -+ freeCmd = TRUE; -+ } - #ifdef U_CYGWIN - sprintf(cmd, "%s%s%s %s -o %s%s %s %s%s %s %s", - pkgDataFlags[GENLIB], -@@ -1209,7 +1228,7 @@ - tempObjectFile[uprv_strlen(tempObjectFile)-1] = 'o'; - - length = uprv_strlen(pkgDataFlags[COMPILER]) + uprv_strlen(pkgDataFlags[LIBFLAGS]) -- + uprv_strlen(tempObjectFile) + uprv_strlen(gencFilePath) + 10; -+ + uprv_strlen(tempObjectFile) + uprv_strlen(gencFilePath) + BUFFER_PADDING_SIZE; - - cmd = (char *)uprv_malloc(sizeof(char) * length); - if (cmd == NULL) { diff --git a/dev-libs/icu/files/icu-4.6.1-parallel_installation.patch b/dev-libs/icu/files/icu-4.6.1-parallel_installation.patch deleted file mode 100644 index e4eec2d4a72b..000000000000 --- a/dev-libs/icu/files/icu-4.6.1-parallel_installation.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=272328 -https://ssl.icu-project.org/trac/ticket/7628 -https://ssl.icu-project.org/trac/changeset/29657 - ---- extra/uconv/Makefile.in -+++ extra/uconv/Makefile.in -@@ -1,6 +1,6 @@ - ## ****************************************************************************** - ## * --## * Copyright (C) 1999-2009, International Business Machines -+## * Copyright (C) 1999-2011, International Business Machines - ## * Corporation and others. All Rights Reserved. - ## * - ## ******************************************************************************* -@@ -147,7 +147,7 @@ - endif - - --package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc -+package-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc - $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst - - $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk -@@ -159,7 +159,7 @@ - - # no install for static mode - ifneq ($(UCONVMSG_MODE),static) --install-resfiles: $(RESFILES) -+install-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc - $(MKINSTALLDIRS) $(DESTDIR)$(ICUDATA_DIR) - $(INVOKE) $(TOOLBINDIR)/pkgdata -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -I $(INSTALLTO) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst - else diff --git a/dev-libs/icu/files/icu-4.8.1-fix_ltr.patch b/dev-libs/icu/files/icu-4.8.1-fix_ltr.patch deleted file mode 100644 index 9bcd217ff3c9..000000000000 --- a/dev-libs/icu/files/icu-4.8.1-fix_ltr.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- release-4-8-1/source/layout/LESwaps.h 2011-10-07 06:52:16.240688181 +0300 -+++ release-4-8/source/layout/LESwaps.h 2011-10-07 05:56:26.915499700 +0300 -@@ -45,8 +45,8 @@ - public: - - /** -- * Reads a big-endian 16-bit word and returns a native-endian value. -- * No-op on a big-endian platform, byte-swaps on a little-endian platform. -+ * This method does the byte swap required on little endian platforms -+ * to correctly access a (16-bit) word. - * - * @param value - the word to be byte swapped - * -@@ -56,19 +56,12 @@ - */ - static le_uint16 swapWord(le_uint16 value) - { --#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || (defined(BYTE_ORDER) && defined(BIG_ENDIAN)) || defined(__BIG_ENDIAN__) -- // Fastpath when we know that the platform is big-endian. -- return value; --#else -- // Reads a big-endian value on any platform. -- const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value); -- return (le_uint16)((p[0] << 8) | p[1]); --#endif -+ return (le_uint16)((value << 8) | (value >> 8)); - }; - - /** -- * Reads a big-endian 32-bit word and returns a native-endian value. -- * No-op on a big-endian platform, byte-swaps on a little-endian platform. -+ * This method does the byte swapping required on little endian platforms -+ * to correctly access a (32-bit) long. - * - * @param value - the long to be byte swapped - * -@@ -78,14 +71,11 @@ - */ - static le_uint32 swapLong(le_uint32 value) - { --#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || (defined(BYTE_ORDER) && defined(BIG_ENDIAN)) || defined(__BIG_ENDIAN__) -- // Fastpath when we know that the platform is big-endian. -- return value; --#else -- // Reads a big-endian value on any platform. -- const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value); -- return (le_uint32)((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]); --#endif -+ return (le_uint32)( -+ (value << 24) | -+ ((value << 8) & 0xff0000) | -+ ((value >> 8) & 0xff00) | -+ (value >> 24)); - }; - - private: |