Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (02be4fac9fd6996c1327c3b3547d731ed5b042e1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (02be4fac9fd6996c1327c3b3547d731ed5b042e1)
  • Date: Thu, 8 Jul 2010 00:09:53 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

devel/codeblocks/02_ftbfs_gcc44.dpatch | 161
---------------------------
devel/codeblocks/DETAILS | 2
devel/codeblocks/HISTORY | 5
devel/codeblocks/PRE_BUILD | 5
devel/codeblocks/automake.patch | 18 ---
devel/codeblocks/gtk-update-icon-cache.patch | 42 -------
6 files changed, 6 insertions(+), 227 deletions(-)

New commits:
commit 02be4fac9fd6996c1327c3b3547d731ed5b042e1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

codeblock: fix release build

diff --git a/devel/codeblocks/02_ftbfs_gcc44.dpatch
b/devel/codeblocks/02_ftbfs_gcc44.dpatch
deleted file mode 100644
index 4a48d51..0000000
--- a/devel/codeblocks/02_ftbfs_gcc44.dpatch
+++ /dev/null
@@ -1,161 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_ftbfs_gcc44.dpatch by Felix Geyer <debfx-pkg AT fobos.de>
-##
-## DP: Fix FTBFS with gcc 4.4
-## DP: Taken from upstream svn commit 5613
-
-@DPATCH@
-
---- trunk/src/src/prefix.cpp 2009/05/30 07:19:02 5612
-+++ trunk/src/src/prefix.cpp 2009/05/30 16:45:25 5613
-@@ -12,7 +12,7 @@
- * Written by: Mike Hearn <mike AT theoretic.com>
- * Hongli Lai <h.lai AT chello.nl>
- * http://autopackage.org/
-- *
-+ *
- * This source code is public domain. You can relicense this code
- * under whatever license you want.
- *
-@@ -202,21 +202,20 @@
- char *
- br_prepend_prefix (void *symbol, char *path)
- {
-- char *tmp, *newpath;
--
-- br_return_val_if_fail (symbol != NULL, (char*)NULL);
-- br_return_val_if_fail (path != NULL, (char*)NULL);
-+ br_return_val_if_fail (symbol != 0, (char*)0);
-+ br_return_val_if_fail (path != 0, (char*)0);
-
-- tmp = br_locate_prefix (symbol);
-- if (!tmp) return (char*)NULL;
-+ char* tmp = br_locate_prefix (symbol);
-+ if (!tmp) return (char*)0;
-
-+ char *newpath;
- if (strcmp (tmp, "/") == 0)
- newpath = strdup (path);
- else
- newpath = br_strcat (tmp, path);
-
- /* Get rid of compiler warning ("br_prepend_prefix never used") */
-- if (0) br_prepend_prefix (NULL, (char*)NULL);
-+ if (0) br_prepend_prefix (0, (char*)0);
-
- free (tmp);
- return newpath;
-@@ -240,9 +239,7 @@
- static void
- br_thread_local_store_fini ()
- {
-- char *specific;
--
-- specific = (char *) pthread_getspecific (br_thread_key);
-+ char* specific = (char *) pthread_getspecific (br_thread_key);
- if (specific)
- {
- free (specific);
-@@ -301,11 +298,9 @@
- br_thread_local_store (char *str)
- {
- #if BR_PTHREADS
-- char *specific;
--
- pthread_once (&br_thread_key_once,
br_thread_local_store_init);
-
-- specific = (char *) pthread_getspecific (br_thread_key);
-+ char* specific = (char *) pthread_getspecific (br_thread_key);
- br_str_free (specific);
- pthread_setspecific (br_thread_key, str);
-
-@@ -338,16 +333,13 @@
- char *
- br_strcat (const char *str1, const char *str2)
- {
-- char *result;
-- size_t len1, len2;
--
- if (!str1) str1 = "";
- if (!str2) str2 = "";
-
-- len1 = strlen (str1);
-- len2 = strlen (str2);
-+ size_t len1 = strlen (str1);
-+ size_t len2 = strlen (str2);
-
-- result = (char *) malloc (len1 + len2 + 1);
-+ char* result = (char *) malloc (len1 + len2 + 1);
- memcpy (result, str1, len1);
- memcpy (result + len1, str2, len2);
- result[len1 + len2] = '\0';
-@@ -360,16 +352,13 @@
- static char *
- br_strndup (char *str, size_t size)
- {
-- char *result = (char *) NULL;
-- size_t len;
-+ br_return_val_if_fail (str != (char *) 0, (char *) 0);
-
-- br_return_val_if_fail (str != (char *) NULL, (char *) NULL);
--
-- len = strlen (str);
-+ size_t len = strlen (str);
- if (!len) return strdup ("");
- if (size > len) size = len;
-
-- result = (char *) calloc (sizeof (char), len + 1);
-+ char* result = (char *) calloc (sizeof (char), len + 1);
- memcpy (result, str, size);
- return result;
- }
-@@ -389,16 +378,16 @@
- char *
- br_extract_dir (const char *path)
- {
-- char *end, *result;
--
-- br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
-+ br_return_val_if_fail (path != (char *) 0, (char *) 0);
-
-- end = strrchr (path, '/');
-+ const char* end = strrchr (path, '/');
- if (!end) return strdup (".");
-
- while (end > path && *end == '/')
-+ {
- end--;
-- result = br_strndup ((char *) path, end - path + 1);
-+ }
-+ char* result = br_strndup ((char *) path, end - path + 1);
- if (!*result)
- {
- free (result);
-@@ -424,15 +413,13 @@
- char *
- br_extract_prefix (const char *path)
- {
-- char *end, *tmp, *result;
--
-- br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
-+ br_return_val_if_fail (path != (char *) 0, (char *) 0);
-
- if (!*path) return strdup ("/");
-- end = strrchr (path, '/');
-+ const char* end = strrchr (path, '/');
- if (!end) return strdup (path);
-
-- tmp = br_strndup ((char *) path, end - path);
-+ char* tmp = br_strndup ((char *) path, end - path);
- if (!*tmp)
- {
- free (tmp);
-@@ -441,7 +428,7 @@
- end = strrchr (tmp, '/');
- if (!end) return tmp;
-
-- result = br_strndup (tmp, end - tmp);
-+ char* result = br_strndup (tmp, end - tmp);
- free (tmp);
-
- if (!*result)
diff --git a/devel/codeblocks/DETAILS b/devel/codeblocks/DETAILS
index 1e51d6b..d5ff64b 100755
--- a/devel/codeblocks/DETAILS
+++ b/devel/codeblocks/DETAILS
@@ -15,7 +15,7 @@ else

SOURCE_HASH=sha512:2f8f34ec7d53d032ade019db7dd543cd4c3790c437db2d9b3f6cd0a6ba3b8850f1c7bb330ef5df33f7fb049eaad51bbc79d0352c007459b12a753e025bf52b2f
SOURCE="${SPELL}-${VERSION}-src.tar.bz2"
SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-release"
fi
WEB_SITE="http://www.codeblocks.org/";
LICENSE[0]=GPL
diff --git a/devel/codeblocks/HISTORY b/devel/codeblocks/HISTORY
index 4ae40b2..c6fb710 100644
--- a/devel/codeblocks/HISTORY
+++ b/devel/codeblocks/HISTORY
@@ -1,3 +1,8 @@
+2010-07-08 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_DIRECTORY for release
+ * PRE_BUILD, 02_ftbfs_gcc44.dpatch, automake.patch,
+ gtk-update-icon-cache.patch: removed, not needed anymore
+
2010-07-07 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 10.05
diff --git a/devel/codeblocks/PRE_BUILD b/devel/codeblocks/PRE_BUILD
deleted file mode 100755
index 5195e02..0000000
--- a/devel/codeblocks/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p0 < ${SCRIPT_DIRECTORY}/gtk-update-icon-cache.patch &&
-patch -p0 < ${SCRIPT_DIRECTORY}/automake.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/02_ftbfs_gcc44.dpatch
diff --git a/devel/codeblocks/automake.patch b/devel/codeblocks/automake.patch
deleted file mode 100644
index 3829227..0000000
--- a/devel/codeblocks/automake.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- bootstrap.orig 2010-04-02 13:02:21.394443953 +0200
-+++ bootstrap 2010-04-02 13:03:15.957443368 +0200
-@@ -42,15 +42,6 @@
- exit 1;
- fi
-
--if test -n "`$AUTOMAKE --version 2>&1|head -n 1|egrep
'1\.[0-6](\.[0-9]+)?$'`"; then
-- echo "Automake 1.7 or above is required. Aborting build...";
-- exit 1;
--fi
--
--if test -n "`$AUTOMAKE --version 2>&1|head -n 1|egrep
'1\.7(\.[0-9]+)?$|1\.8(\.[0-9]+)?$'`"; then
-- echo "make dist only supported with automake 1.9 or above" >&2;
--fi
--
- if test -n "`$LIBTOOL --version 2>&1|head -n 1|cut -f 4 -d ' '|egrep
'1\.[0-3](\.[0-9]+)?$'`"; then
- echo "Libtool 1.4 or above is required. Aborting build...";
- exit 1;
diff --git a/devel/codeblocks/gtk-update-icon-cache.patch
b/devel/codeblocks/gtk-update-icon-cache.patch
deleted file mode 100644
index b38d531..0000000
--- a/devel/codeblocks/gtk-update-icon-cache.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/setup/mime/Makefile.am.orig 2008-12-18 15:47:39.812769956 +0100
-+++ src/setup/mime/Makefile.am 2008-12-18 15:52:38.879406921 +0100
-@@ -27,9 +27,6 @@
- if which update-desktop-database>/dev/null 2>&1; then \
- update-desktop-database; \
- fi; \
-- if which gtk-update-icon-cache>/dev/null 2>&1; then \
-- gtk-update-icon-cache --force
$(DESTDIR)$(datadir)/icons/gnome; \
-- fi \
- fi
-
- uninstall-hook:
-@@ -40,7 +37,4 @@
- if which update-desktop-database>/dev/null 2>&1; then \
- update-desktop-database; \
- fi; \
-- if which gtk-update-icon-cache>/dev/null 2>&1; then \
-- gtk-update-icon-cache --force
$(DESTDIR)$(datadir)/icons/gnome; \
-- fi \
- fi
---- src/setup/mime/Makefile.in.orig 2008-12-18 15:47:45.706102794 +0100
-+++ src/setup/mime/Makefile.in 2008-12-18 15:53:03.912727516 +0100
-@@ -490,9 +490,6 @@
- if which update-desktop-database>/dev/null 2>&1; then \
- update-desktop-database; \
- fi; \
-- if which gtk-update-icon-cache>/dev/null 2>&1; then \
-- gtk-update-icon-cache --force
$(DESTDIR)$(datadir)/icons/gnome; \
-- fi \
- fi
-
- uninstall-hook:
-@@ -503,9 +500,6 @@
- if which update-desktop-database>/dev/null 2>&1; then \
- update-desktop-database; \
- fi; \
-- if which gtk-update-icon-cache>/dev/null 2>&1; then \
-- gtk-update-icon-cache --force
$(DESTDIR)$(datadir)/icons/gnome; \
-- fi \
- fi
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (02be4fac9fd6996c1327c3b3547d731ed5b042e1), Ismael Luceno, 07/08/2010

Archive powered by MHonArc 2.6.24.

Top of Page