Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (f8b1ff81527854e4c2c0a436bac85bb9c0bffe93)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (f8b1ff81527854e4c2c0a436bac85bb9c0bffe93)
  • Date: Fri, 13 May 2011 18:42:34 -0500

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

gnome2-libs/evolution-exchange/02_remove-disable-deprecated.patch | 21
++++++++++
gnome2-libs/evolution-exchange/DEPENDS | 1
gnome2-libs/evolution-exchange/HISTORY | 6 ++
gnome2-libs/evolution-exchange/PRE_BUILD | 6 ++
kde4/kdegames4/DEPENDS | 6 ++
kde4/kdegames4/HISTORY | 4 +
utils/notify-osd/DETAILS | 7 +--
utils/notify-osd/HISTORY | 4 +
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 3 +
10 files changed, 55 insertions(+), 5 deletions(-)

New commits:
commit 9927887b632d833bc4f7807e0f55211788409565
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evolution-exchange: Fix compilation with newer gtk+2
Depends on autoconf for `autoconf` in PRE_BUILD
Apply 02_remove-disable-deprecated.patch to fix compilation with new gtk+2
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622015

commit 9ae3ac84b2cb8d059feac0e38b6f71925ae9dc81
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kdegames4: Disable OpenAL support in Granatier if not using openal-soft
or if requested to not use OpenAL in favour of Phonon

$ gaze from /usr/include/AL/altypes.h
openal-20050601:/usr/include/AL/altypes.h

$ gaze version openal{,-soft}
Grimoire Section Spell Grimoire Version Installed Version
-------- ------- ----- ---------------- -----------------
test audio-libs openal 20050601 20050601
test audio-libs openal-soft 1.13 -

[ 10%] Built target granatier_automoc
[ 10%] Building CXX object
granatier/src/CMakeFiles/granatier.dir/TagaroAudio/au
dioscene.o
In file included from /usr/include/AL/al.h:23,
from
/usr/src/kdegames-4.6.3/granatier/src/TagaroAudio/openalru
ntime_p.h:25,
from
/usr/src/kdegames-4.6.3/granatier/src/TagaroAudio/audiosce
ne.cpp:20:
/usr/include/AL/altypes.h:461:6: warning: "AL_PURE_API" is not defined
/usr/src/kdegames-4.6.3/granatier/src/TagaroAudio/audioscene.cpp: In
constructor 'Tagaro::OpenALRuntime::OpenALRuntime()':
/usr/src/kdegames-4.6.3/granatier/src/TagaroAudio/audioscene.cpp:63:
error: invalid conversion from 'const char*' to 'const ALubyte*'
/usr/src/kdegames-4.6.3/granatier/src/TagaroAudio/audioscene.cpp:63:
error: initializing argument 1 of 'ALCdevice* alcOpenDevice(const
ALubyte*)'
make[2]: ***
[granatier/src/CMakeFiles/granatier.dir/TagaroAudio/audioscene.o] Error
1
make[1]: *** [granatier/src/CMakeFiles/granatier.dir/all] Error 2
make: *** [all] Error 2

commit bbef44810aa9f158c61c9b0b951f2d8c317db1ae
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Updated latest devel to 1.3.20

commit 2f33b616437e00cb4ed92e849bebff48f646196a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

notify-osd: update to 0.9.30

diff --git
a/gnome2-libs/evolution-exchange/02_remove-disable-deprecated.patch
b/gnome2-libs/evolution-exchange/02_remove-disable-deprecated.patch
new file mode 100644
index 0000000..7bf8791
--- /dev/null
+++ b/gnome2-libs/evolution-exchange/02_remove-disable-deprecated.patch
@@ -0,0 +1,21 @@
+#
+# Extracted from evolution-exchange_2.32.2-2.debian.tar.gz
+#
+--- evolution-exchange-2.32.2/configure.ac.orig 2011-02-06
05:54:00.000000000 +0100
++++ evolution-exchange-2.32.2/configure.ac 2011-04-11 08:41:26.402135996
+0200
+@@ -60,14 +60,7 @@ dnl **********************
+ dnl Compiler Warning Flags
+ dnl **********************
+ AS_COMPILER_FLAGS(WARNING_FLAGS,
+- "-DG_DISABLE_DEPRECATED
+- -DPANGO_DISABLE_DEPRECATED
+- -DGDK_DISABLE_DEPRECATED
+- -DGDK_PIXBUF_DISABLE_DEPRECATED
+- -DGTK_DISABLE_DEPRECATED
+- -DE_BOOK_DISABLE_DEPRECATED
+- -DE_CAL_DISABLE_DEPRECATED
+- -DG_DISABLE_SINGLE_INCLUDES
++ "-DG_DISABLE_SINGLE_INCLUDES
+ -DGTK_DISABLE_SINGLE_INCLUDES
+ -DGSEAL_ENABLE
+ -Wall -Wextra
diff --git a/gnome2-libs/evolution-exchange/DEPENDS
b/gnome2-libs/evolution-exchange/DEPENDS
index 69ca5a8..07c8d37 100755
--- a/gnome2-libs/evolution-exchange/DEPENDS
+++ b/gnome2-libs/evolution-exchange/DEPENDS
@@ -1,3 +1,4 @@
+depends autoconf &&
depends glib2 &&
depends gtk+2 &&
depends gconf2 &&
diff --git a/gnome2-libs/evolution-exchange/HISTORY
b/gnome2-libs/evolution-exchange/HISTORY
index 6dbaeb2..225f7cb 100644
--- a/gnome2-libs/evolution-exchange/HISTORY
+++ b/gnome2-libs/evolution-exchange/HISTORY
@@ -1,3 +1,9 @@
+2011-05-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on autoconf for `autoconf` in PRE_BUILD
+ * PRE_BUILD: Apply 02_remove-disable-deprecated.patch
+ * 02_remove-disable-deprecated.patch: Fix compilation with new gtk+2
+ See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622015
+
2011-02-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.32.2

diff --git a/gnome2-libs/evolution-exchange/PRE_BUILD
b/gnome2-libs/evolution-exchange/PRE_BUILD
new file mode 100755
index 0000000..e360c06
--- /dev/null
+++ b/gnome2-libs/evolution-exchange/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+message "${MESSAGE_COLOR}Applying newer gtk+2 patch...${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}"/configure.ac \
+ "${SPELL_DIRECTORY}"/02_remove-disable-deprecated.patch &&
+autoconf
diff --git a/kde4/kdegames4/DEPENDS b/kde4/kdegames4/DEPENDS
index 874876f..5d6bbf9 100755
--- a/kde4/kdegames4/DEPENDS
+++ b/kde4/kdegames4/DEPENDS
@@ -3,4 +3,8 @@ sub_depends qt4 'OPENGL' &&
# granatier can use either gluon or phonon
#optional_depends gluon-lib '' '' 'better sound for granatier' &&
optional_depends qca2 '' '' 'Cryptographic support' &&
-optional_depends ggz-client-libs '' '' 'register KDE games with GGZ games'
games
+optional_depends ggz-client-libs '' '' 'register KDE games with GGZ games'
games &&
+optional_depends openal-soft \
+ '-DWITH_OpenAL=ON' \
+ '-DWITH_OpenAL=OFF' \
+ 'for OpenAL sound output in Granatier (instead of Phonon)'
diff --git a/kde4/kdegames4/HISTORY b/kde4/kdegames4/HISTORY
index ed1528a..da7c286 100644
--- a/kde4/kdegames4/HISTORY
+++ b/kde4/kdegames4/HISTORY
@@ -1,3 +1,7 @@
+2011-05-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Disable OpenAL support in Granatier if not using
openal-soft
+ or if requested to not use OpenAL in favour of Phonon
+
2011-05-06 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.6.3

diff --git a/utils/notify-osd/DETAILS b/utils/notify-osd/DETAILS
index 8c63393..a714af1 100755
--- a/utils/notify-osd/DETAILS
+++ b/utils/notify-osd/DETAILS
@@ -1,8 +1,9 @@
SPELL=notify-osd
- VERSION=0.9.11
+ VERSION=0.9.30
+ BRANCH=natty/natty-alpha3
SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://launchpad.net/${SPELL}/trunk/${VERSION}/+download/${SOURCE}
-
SOURCE_HASH=sha512:199e683dc8d1889b2c38c7e3b2ff3258b3fde54e9d4e8fbfa4beb9b0b452e454258cec72fca5f26a420b133720cb76c2f2cb3254d845baa6f6718219ca8addbe
+ SOURCE_URL[0]=http://launchpad.net/${SPELL}/${BRANCH}/+download/${SOURCE}
+
SOURCE_HASH=sha512:1220f8df01830a7d0b6b0fba71e055a88990b5e67a4c25654956da663af582412b93b48efb07c342791f19599fe563f5be8a93849be6270340c8f1f09508cc9a
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://launchpad.net/notify-osd";
LICENSE[0]=GPL
diff --git a/utils/notify-osd/HISTORY b/utils/notify-osd/HISTORY
index e8f796b..32d22a9 100644
--- a/utils/notify-osd/HISTORY
+++ b/utils/notify-osd/HISTORY
@@ -1,3 +1,7 @@
+2011-05-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Updated to 0.9.30
+ Fixed SOURCE_URL[0]
+
2009-07-27 Finn Haedicke <finn_haedicke AT gmx.net>
* DETAILS: spell created

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index d663578..fc32287 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_DEVEL == y ]]; then
- VERSION=1.3.19
+ VERSION=1.3.20
else
VERSION=1.2.3
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 5bb03a0..fd82de0 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated latest devel to 1.3.20
+
2011-05-02 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Optionally depends on gnutls
Add flags for freetype



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (f8b1ff81527854e4c2c0a436bac85bb9c0bffe93), Eric Sandall, 05/13/2011

Archive powered by MHonArc 2.6.24.

Top of Page