New commits:
commit feb963f67c59fd373af75e68074ef8767fc6cf2c
Author: George Sherwood <chat AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
eb-lite: Removed spell. Not developed. Won't build anymore.
Conflicts:
ChangeLog
commit e6aa9ead17b2bc54d2dc769ad17c45eb3f9ab0e3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
xmms-crossfade: fix #12281
thanks to Lubomir Blaha for a patch
commit de3040e9562fc7c1d5c6b6fe8b54fb46f9909689
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
bfilter: DEPENDS: updated to use gtkmm2 instead of gtkmm #12653
commit 201661215b7fb577fd9c2955b5de738187b083e4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
lyx: s/GECKO/WEB-BROWSER #13062
Conflicts:
editors/lyx/DEPENDS
editors/lyx/HISTORY
commit 0a3d907e193fadbd55060cbf0749ba55fa2f0eec
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
arc: added RH patch to make it build #13147
commit 3ee9dec884e2db79c248d2e595562a1ac2bd3969
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
qc-usb: Fix compile with gcc4, bug #13171.
commit 13ec5d2d9b0fa9e6edb9a6a1eeb197d502d9111c
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
kdegames: Bug 13203 + minor fixes.
commit e3193d4d2918c7aca4a82c45b52f19568db0377d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
libs/sdl_pango: new spell (guess what it does) #13217
thanks go to Puppet_Master
Conflicts:
ChangeLog
commit 746e2aaf9a7d6d92302b78ee384cc7fadc110b97
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Eric Sandall <sandalle@moby.(none)>
commit 9eff76ce1281d76a5a8d1dba9a2b53ad9b9db3c5
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle@moby.(none)>
console-tools: properly fix #10112
diff --git a/ChangeLog b/ChangeLog
index 2d3d9ed..2212317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,21 +1,12 @@
-2006-10-21 Lalo Martins <lalo AT sourcemage.org>
- * beryl/*: added beryl-related spells
+2006-11-11 George Sherwood <george AT beernabeer.com>
+ * chat-im/eb-lite: removed. Not developed. Won't build.
-2006-10-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
- * accounts, groups: added iplog
+2006-10-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libs/sdl_pango: new spell (guess what it does) #13217
2006-10-20 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* security/netpipe renamed to netpipe-redirector to avoid conflict
#8580
-2006-10-20 Juuso Alasuutari <iuso AT sourcemage.org>
- * kde-apps/KDE_DEPENDS: Source is_depends_enabled.function
- (remove it when is_depends_enabled is in stable sorcery).
- * kde-core/KDE_DEPENDS: Source is_depends_enabled.function.
-
-2006-10-19 Juuso Alasuutari <iuso AT sourcemage.org>
- * is_depends_enabled.function: Added temporarily, to be removed
- once is_depends_enabled is in stable sorcery.
-
2006-10-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* smgl/Tim renamed to tim #10658
-suggest_depends firefox-smglwiki '' '' 'to enable searching the SMGL Wiki
from the Search Bar' &&
+suggest_depends_2 firefox-smglwiki '' '' \
+ 'to enable searching the SMGL Wiki from the Search Bar' &&
if [ "$FIREFOX_GTK" == "2.x" ]; then
depends gtk+2 \
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 2e273b8..1f28591 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2006-11-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: change suggest_depends to sub_depends_2 for #13244
+
2006-10-06 Juuso Alasuutari <iuso AT sourcemage.org>
* firefox.sh: Removed bashism.
. $CFG
diff --git a/kde-core/kde-i18n/HISTORY b/kde-core/kde-i18n/HISTORY
index fa72c61..3b03de2 100644
--- a/kde-core/kde-i18n/HISTORY
+++ b/kde-core/kde-i18n/HISTORY
@@ -1,3 +1,7 @@
+2006-11-12 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE: reconfigure always shall dfault to n,
+ removing the config_ from the query
+
2006-10-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.5.5
# fall back to optional_depends if suggest_depends isn't implemented
-declare -f suggest_depends &> /dev/null ||
-function suggest_depends() {
- optional_depends "$@"
-}
+# OR fall back to true - this is needed to avoid some circular dependencies
+# see #13244 for an example
+if declare -f suggest_depends &> /dev/null; then
+ function suggest_depends_2() {
+ suggest_depends "$@"
+ }
+else
+ function suggest_depends() {
+ optional_depends "$@"
+ }
+
+ function suggest_depends_2() {
+ true
+ }
+fi
# fall back to depends if runtime_depends isn't implemented
declare -f runtime_depends &> /dev/null ||
diff --git a/libs/sdl_pango/CONFIGURE b/libs/sdl_pango/CONFIGURE
new file mode 100755
index 0000000..59f138d
--- /dev/null
+++ b/libs/sdl_pango/CONFIGURE
@@ -0,0 +1,2 @@
+config_query FB_PATCH "Do you want to patch $SPELL for Frozen Bubble 2.0.0?"
n
+
diff --git a/libs/sdl_pango/DEPENDS b/libs/sdl_pango/DEPENDS
new file mode 100755
index 0000000..73a7f16
--- /dev/null
+++ b/libs/sdl_pango/DEPENDS
@@ -0,0 +1,3 @@
+depends sdl &&
+depends glib2 &&
+depends pango
diff --git a/libs/sdl_pango/DETAILS b/libs/sdl_pango/DETAILS
new file mode 100755
index 0000000..5f18ad7
--- /dev/null
+++ b/libs/sdl_pango/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=sdl_pango
+ VERSION=0.1.2
+ SOURCE=SDL_Pango-${VERSION}.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/SDL_Pango-${VERSION}
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/sdlpango/${SOURCE}
+
SOURCE_HASH=sha512:081ec57e0f55ce541c35393d6db7ea48b662a5008760781076d70c0a645d47f7e994f695c459ed51f8cb71494911a04cd416733fb57934321b806a1ac9878440
+ LICENSE[0]=GPL
+ WEB_SITE=http://sdlpango.sourceforge.net
+ ENTERED=20061028
+ SHORT="SDL_Pango connects pango to SDL"
+cat << EOF
+Pango is the text rendering engine of GNOME 2. SDL_Pango connects that engine
+to SDL, the Simple DirectMedia Layer.
+EOF
diff --git a/libs/sdl_pango/HISTORY b/libs/sdl_pango/HISTORY
new file mode 100644
index 0000000..0e440f1
--- /dev/null
+++ b/libs/sdl_pango/HISTORY
@@ -0,0 +1,2 @@
+2006-10-27 Philippe "Puppet_Master" Caseiro <caseiro.philippe AT gmail.com>
+ * Initial spell
diff --git a/libs/sdl_pango/PRE_BUILD b/libs/sdl_pango/PRE_BUILD
new file mode 100755
index 0000000..8a0a433
--- /dev/null
+++ b/libs/sdl_pango/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+if [[ "$FB_PATCH" == "y" ]]; then
+ cd $SOURCE_DIRECTORY
+ patch -p0 src/SDL_Pango.c $SPELL_DIRECTORY/SDL_Pango-0.1.2-API-adds.patch
+fi
+
+
diff --git a/libs/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
b/libs/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
new file mode 100644
index 0000000..1535a56
--- /dev/null
+++ b/libs/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
@@ -0,0 +1,116 @@
+--- src/SDL_Pango.c 2004-12-10 10:06:33.000000000 +0100
++++ src/SDL_Pango.c 2006-09-24 22:46:24.000000000 +0200
+@@ -723,13 +723,8 @@
+ SDL_UnlockSurface(surface);
+ }
+
+-/*!
+- Create a context which contains Pango objects.
+-
+- @return A pointer to the context as a SDLPango_Context*.
+-*/
+ SDLPango_Context*
+-SDLPango_CreateContext()
++SDLPango_CreateContext_GivenFontDesc(const char* font_desc)
+ {
+ SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));
+ G_CONST_RETURN char *charset;
+@@ -743,8 +738,7 @@
+ pango_context_set_language (context->context,
pango_language_from_string (charset));
+ pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR);
+
+- context->font_desc = pango_font_description_from_string(
+- MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
++ context->font_desc = pango_font_description_from_string(font_desc);
+
+ context->layout = pango_layout_new (context->context);
+
+@@ -762,6 +756,17 @@
+ }
+
+ /*!
++ Create a context which contains Pango objects.
++
++ @return A pointer to the context as a SDLPango_Context*.
++*/
++SDLPango_Context*
++SDLPango_CreateContext()
++{
++
SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY,
DEFAULT_FONT_SIZE));
++}
++
++/*!
+ Free a context.
+
+ @param *context [i/o] Context to be free
+@@ -1053,6 +1058,20 @@
+ pango_layout_set_font_description (context->layout, context->font_desc);
+ }
+
++void
++SDLPango_SetText_GivenAlignment(
++ SDLPango_Context *context,
++ const char *text,
++ int length,
++ SDLPango_Alignment alignment)
++{
++ pango_layout_set_attributes(context->layout, NULL);
++ pango_layout_set_text (context->layout, text, length);
++ pango_layout_set_auto_dir (context->layout, TRUE);
++ pango_layout_set_alignment (context->layout, alignment);
++ pango_layout_set_font_description (context->layout, context->font_desc);
++}
++
+ /*!
+ Set plain text to context.
+ Text must be utf-8.
+@@ -1067,11 +1086,7 @@
+ const char *text,
+ int length)
+ {
+- pango_layout_set_attributes(context->layout, NULL);
+- pango_layout_set_text (context->layout, text, length);
+- pango_layout_set_auto_dir (context->layout, TRUE);
+- pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT);
+- pango_layout_set_font_description (context->layout, context->font_desc);
++ SDLPango_SetText_GivenAlignment(context, text, length,
SDLPANGO_ALIGN_LEFT);
+ }
+
+ /*!
+--- src/SDL_Pango.h 2004-12-10 10:06:33.000000000 +0100
++++ src/SDL_Pango.h 2006-09-24 22:46:01.000000000 +0200
+@@ -109,12 +109,20 @@
+ SDLPANGO_DIRECTION_NEUTRAL /*! Neutral */
+ } SDLPango_Direction;
+
+-
++/*!
++ Specifies alignment of text. See Pango reference for detail
++*/
++typedef enum {
++ SDLPANGO_ALIGN_LEFT,
++ SDLPANGO_ALIGN_CENTER,
++ SDLPANGO_ALIGN_RIGHT
++} SDLPango_Alignment;
+
+ extern DECLSPEC int SDLCALL SDLPango_Init();
+
+ extern DECLSPEC int SDLCALL SDLPango_WasInit();
+
++extern DECLSPEC SDLPango_Context* SDLCALL
SDLPango_CreateContext_GivenFontDesc(const char* font_desc);
+ extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext();
+
+ extern DECLSPEC void SDLCALL SDLPango_FreeContext(
+@@ -157,6 +165,12 @@
+ const char *markup,
+ int length);
+
++extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment(
++ SDLPango_Context *context,
++ const char *text,
++ int length,
++ SDLPango_Alignment alignment);
++
+ extern DECLSPEC void SDLCALL SDLPango_SetText(
+ SDLPango_Context *context,
+ const char *markup,
diff --git a/security/oinkmaster/DETAILS b/security/oinkmaster/DETAILS
index 708f105..73d56a1 100755
--- a/security/oinkmaster/DETAILS
+++ b/security/oinkmaster/DETAILS
@@ -4,6 +4,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
SOURCE_HASH=sha512:03874462cff71e558d4383fef9e757eb4260b20f4b1de4741edcd49fec6effe32669e95edb637962b77b12c519deeb74adc3c15427d0e054e1b96e2f03ffdb3b
+ BUILD_API=2
LICENSE[0]=BSD
ENTERED=20030726
WEB_SITE=http://oinkmaster.sourceforge.net
diff --git a/security/oinkmaster/HISTORY b/security/oinkmaster/HISTORY
index b6d833e..4ec065d 100644
--- a/security/oinkmaster/HISTORY
+++ b/security/oinkmaster/HISTORY
@@ -1,6 +1,3 @@
-2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: [automated] Removed BUILD_API=2.
-
2006-08-27 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.0. Updated to BUILD_API=2
Removed old SOURCE_URLS. Removed UPDATED & MAINTAINER
diff --git a/shell-term-fm/screen/DETAILS b/shell-term-fm/screen/DETAILS
index c6ff22e..880b42a 100755
--- a/shell-term-fm/screen/DETAILS
+++ b/shell-term-fm/screen/DETAILS
@@ -1,14 +1,14 @@
SPELL=screen
- VERSION=4.0.2
+ VERSION=4.0.3
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.uni-erlangen.de/pub/utilities/${SPELL}/${SOURCE}
SOURCE_URL[1]=ftp://ftp.sourcemage.sk/sources/${SOURCE}
SOURCE_URL[2]=$GNU_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:a003f2703659644a08436f8c3c8ca4000f35309f1615a2e7a1a1c774f88e9a6129c93a933debf9aa6b3265a177b67a1f4dc94dd10680ed34279c4c1d6255521e
+
SOURCE_HASH=sha512:24c1f598972f3dc9ed49cd2c05852190a0190d22fa01401eee8484627c8dd2815f0a422d9b2697faa8aaa0b3efc6730a94e2d5aa787dbe5e9ec719143176c338
WEB_SITE=http://www.gnu.org/software/screen
ENTERED=20010922
- UPDATED=20040517
+ SECURITY_PATCH=1
LICENSE[0]=GPL2
KEYWORDS="terminal console"
SHORT="screen multiplexes a physical terminal"
diff --git a/shell-term-fm/screen/HISTORY b/shell-term-fm/screen/HISTORY
index 96224ee..3aee756 100644
--- a/shell-term-fm/screen/HISTORY
+++ b/shell-term-fm/screen/HISTORY
@@ -1,3 +1,7 @@
+2006-10-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: update to 4.0.3 + SECURITY_PATCH=1,
+ http://secunia.com/advisories/22583/
+
2006-07-23 david Kowis <dkowis AT shlrm.org>
* CONFIGURE: made replacement of screenrc default to no