Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4956c93ae8dbf9ef6f0010149898446542f7e8ef)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4956c93ae8dbf9ef6f0010149898446542f7e8ef)
  • Date: Thu, 18 Dec 2008 10:38:19 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

devel/codeblocks/BUILD | 2 -
devel/codeblocks/DEPENDS | 2 -
devel/codeblocks/DETAILS | 16 +++++++---
devel/codeblocks/HISTORY | 5 +++
devel/codeblocks/PREPARE | 5 ++-
devel/codeblocks/PRE_BUILD | 3 +
devel/codeblocks/gtk-update-icon-cache.patch | 42
+++++++++++++++++++++++++++
video/mythtv/BUILD | 2 -
video/mythtv/HISTORY | 3 +
9 files changed, 72 insertions(+), 8 deletions(-)

New commits:
commit b8d3231d27c4e382567f0d155df8dd1ef76e8856
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/codeblocks: added option to build the stable version

commit b86139eb8393264095a54b14583e74952cf7ff60
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/mythtv: added disable_pic to BUILD

diff --git a/devel/codeblocks/BUILD b/devel/codeblocks/BUILD
index 099a16a..d5b2b7d 100755
--- a/devel/codeblocks/BUILD
+++ b/devel/codeblocks/BUILD
@@ -1,3 +1,3 @@
-./bootstrap &&
+./bootstrap &&
./configure --prefix=/usr --enable-contrib $OPTS &&
make
diff --git a/devel/codeblocks/DEPENDS b/devel/codeblocks/DEPENDS
index 3ccfa52..c677a6a 100755
--- a/devel/codeblocks/DEPENDS
+++ b/devel/codeblocks/DEPENDS
@@ -1 +1 @@
-depends wxgtk
+depends wxgtk
diff --git a/devel/codeblocks/DETAILS b/devel/codeblocks/DETAILS
index 8cfde8a..ac77e1c 100755
--- a/devel/codeblocks/DETAILS
+++ b/devel/codeblocks/DETAILS
@@ -1,14 +1,22 @@
SPELL=codeblocks
-if [[ $SVN_AUTOUPDATE = y ]]; then
+if [[ $CODEBLOCKS_SVN = "y" ]]; then
+ if [[ $SVN_AUTOUPDATE = y ]]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
- SOURCE="${SPELL}.tar.bz2"
+ fi
SOURCE_IGNORE=volatile
SOURCE_URL[0]="svn://svn.berlios.de/${SPELL}/trunk:${SPELL}"
FORCE_DOWNLOAD=on
+ SOURCE="${SPELL}.tar.bz2"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+else
+ VERSION=8.02
+
SOURCE_HASH=sha512:92c9fcfd1efc6ba534a22f5b6128fb66f8ebb0c7abe5a8411990fbdee6b0f1f518366dc567d9ef5e0d2034cad7d8199813171f75418fc5d3e231cc80486c4ebb
+ SOURCE="${SPELL}-${VERSION}-src.tar.bz2"
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+fi
WEB_SITE="http://www.codeblocks.org/";
LICENSE[0]=GPL
ENTERED=20070808
diff --git a/devel/codeblocks/HISTORY b/devel/codeblocks/HISTORY
index 8ddb5ba..9bf9a5b 100644
--- a/devel/codeblocks/HISTORY
+++ b/devel/codeblocks/HISTORY
@@ -1,2 +1,7 @@
+2008-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PREPARE: added option to build the stable version
+ * PRE_BUILD, gtk-update-icon-cache.patch: added patch so install
+ succeeds
+
2007-12-01 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, DEPENDS, HISTORY, PREPARE: created spell
diff --git a/devel/codeblocks/PREPARE b/devel/codeblocks/PREPARE
index 41396af..1ef6e7c 100755
--- a/devel/codeblocks/PREPARE
+++ b/devel/codeblocks/PREPARE
@@ -1 +1,4 @@
-config_query SVN_AUTOUPDATE "Do you want to cast $SPELL on system upgrade?" n
+config_query CODEBLOCKS_SVN "Do you want to use the development version from
svn?" n &&
+if [[ $CODEBLOCKS_SVN == "y" ]]; then
+ config_query SVN_AUTOUPDATE "Do you want to cast $SPELL on system
upgrade?" n
+fi
diff --git a/devel/codeblocks/PRE_BUILD b/devel/codeblocks/PRE_BUILD
new file mode 100755
index 0000000..3a4688b
--- /dev/null
+++ b/devel/codeblocks/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p0 < ${SCRIPT_DIRECTORY}/gtk-update-icon-cache.patch
diff --git a/devel/codeblocks/gtk-update-icon-cache.patch
b/devel/codeblocks/gtk-update-icon-cache.patch
new file mode 100644
index 0000000..b38d531
--- /dev/null
+++ b/devel/codeblocks/gtk-update-icon-cache.patch
@@ -0,0 +1,42 @@
+--- 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.
diff --git a/video/mythtv/BUILD b/video/mythtv/BUILD
index c784e81..15305cd 100755
--- a/video/mythtv/BUILD
+++ b/video/mythtv/BUILD
@@ -1,6 +1,6 @@
#stupid qt4 spell
PATH="$PATH:/usr/bin/qt4" &&
-
+disable_pic &&
QTDIR=${QTDIR:-$INSTALL_ROOT/usr} &&
OPTS="$ENABLE_DVB $ENABLE_OSS $ENABLE_FIREWIRE $ENABLE_JOYSTICK \
--disable-distcc --qmake=/usr/bin/qt4/qmake \
diff --git a/video/mythtv/HISTORY b/video/mythtv/HISTORY
index 0ebbed4..3ac4128 100644
--- a/video/mythtv/HISTORY
+++ b/video/mythtv/HISTORY
@@ -1,3 +1,6 @@
+2008-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: added disable_pic
+
2008-10-13 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS,DEPENDS,BUILD,CONFIGURE,HISTORY: revived spell




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4956c93ae8dbf9ef6f0010149898446542f7e8ef), Florian Franzmann, 12/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page