diff options
author | Andraž Levstik | 2009-01-03 13:56:22 +0100 |
---|---|---|
committer | Andraž Levstik | 2009-01-03 13:56:22 +0100 |
commit | 7292d46601b3edea535e783d8f0b77f77a0920e9 (patch) | |
tree | f8d34ee961dd70a237e49d010a0a081455b09a20 | |
parent | 0f004840808c5c412f7ea38211224cea5abc6dfc (diff) | |
parent | b42c5015d149a3f690333ccd236721005de2a80c (diff) |
Merge branch 'master' of git+ssh://alevstik@scm.sourcemage.org/smgl/grimoire
-rwxr-xr-x | audio-players/cdparanoia/DETAILS | 1 | ||||
-rw-r--r-- | audio-players/cdparanoia/HISTORY | 4 | ||||
-rwxr-xr-x | audio-players/cdparanoia/PRE_BUILD | 3 | ||||
-rw-r--r-- | audio-players/cdparanoia/gcc43-private.patch.bz2 | bin | 0 -> 3341 bytes | |||
-rwxr-xr-x | gnome2-apps/epiphany-extensions/DEPENDS | 4 | ||||
-rw-r--r-- | gnome2-apps/epiphany-extensions/HISTORY | 3 | ||||
-rw-r--r-- | gnome2-apps/epiphany/HISTORY | 4 | ||||
-rwxr-xr-x | gnome2-apps/epiphany/PRE_SUB_DEPENDS | 2 | ||||
-rwxr-xr-x | gnome2-apps/epiphany/REPAIR^2323d34df38f16d5b05e4b7923733c07^PRE_SUB_DEPENDS | 4 | ||||
-rwxr-xr-x | gnome2-apps/epiphany/SUB_DEPENDS | 2 | ||||
-rwxr-xr-x | kde4-apps/amarok2/DEPENDS | 2 | ||||
-rw-r--r-- | kde4-apps/amarok2/HISTORY | 3 | ||||
-rwxr-xr-x | python-pypi/sqlobject/DEPENDS | 1 | ||||
-rw-r--r-- | python-pypi/sqlobject/HISTORY | 3 | ||||
-rwxr-xr-x | utils/gpm/DETAILS | 8 | ||||
-rw-r--r-- | utils/gpm/HISTORY | 8 | ||||
-rwxr-xr-x | utils/gpm/PRE_BUILD | 7 | ||||
-rw-r--r-- | utils/gpm/gpm-OPEN_MAX-1.patch | 14 | ||||
-rw-r--r-- | utils/gpm/gpm-OPEN_MAX-2.patch | 14 | ||||
-rw-r--r-- | utils/gpm/gpm.1.20.1-pts.patch | 13 | ||||
-rwxr-xr-x | utils/strigi/DETAILS | 5 | ||||
-rw-r--r-- | utils/strigi/HISTORY | 3 |
22 files changed, 47 insertions, 61 deletions
diff --git a/audio-players/cdparanoia/DETAILS b/audio-players/cdparanoia/DETAILS index baebcc2a46..c4fdc80068 100755 --- a/audio-players/cdparanoia/DETAILS +++ b/audio-players/cdparanoia/DETAILS @@ -1,5 +1,6 @@ SPELL=cdparanoia VERSION=III-10.2 + PATCHLEVEL=1 SOURCE=$SPELL-$VERSION.src.tgz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=http://downloads.xiph.org/releases/cdparanoia/$SOURCE diff --git a/audio-players/cdparanoia/HISTORY b/audio-players/cdparanoia/HISTORY index ca9554d4b1..1426e78c79 100644 --- a/audio-players/cdparanoia/HISTORY +++ b/audio-players/cdparanoia/HISTORY @@ -1,3 +1,7 @@ +2009-01-03 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * DETAILS: PATCHLEVEL++ + * gcc43-private.patch, PRE_BUILD: added for #14989 + 2008-11-15 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: fixed descs; quoting the paths; removed deprecated vars * BUILD: fixed multijob build diff --git a/audio-players/cdparanoia/PRE_BUILD b/audio-players/cdparanoia/PRE_BUILD new file mode 100755 index 0000000000..3d3e1c56d5 --- /dev/null +++ b/audio-players/cdparanoia/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +bunzip2 $SPELL_DIRECTORY/gcc43-private.patch.bz2 && +patch -p3 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/gcc43-private.patch diff --git a/audio-players/cdparanoia/gcc43-private.patch.bz2 b/audio-players/cdparanoia/gcc43-private.patch.bz2 Binary files differnew file mode 100644 index 0000000000..b036716fd0 --- /dev/null +++ b/audio-players/cdparanoia/gcc43-private.patch.bz2 diff --git a/gnome2-apps/epiphany-extensions/DEPENDS b/gnome2-apps/epiphany-extensions/DEPENDS index 030ce65c7d..a73e4aa430 100755 --- a/gnome2-apps/epiphany-extensions/DEPENDS +++ b/gnome2-apps/epiphany-extensions/DEPENDS @@ -3,8 +3,8 @@ depends xulrunner && depends pcre && if [[ "${EPIPHANY_FAVICON}" == "y" || "${EPIPHANY_PYCON}" == "y" || "${EPIPHANY_SAMPLEPY}" == "y" ]]; then - depends python - sub_depends epiphany gnome-python2 + depends python && + sub_depends epiphany GNOME-PYTHON2 fi && optional_depends opensp \ diff --git a/gnome2-apps/epiphany-extensions/HISTORY b/gnome2-apps/epiphany-extensions/HISTORY index d53c7d53f6..671e726e9c 100644 --- a/gnome2-apps/epiphany-extensions/HISTORY +++ b/gnome2-apps/epiphany-extensions/HISTORY @@ -1,3 +1,6 @@ +2009-01-03 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * DEPENDS: added missing && and uppercased the subdep #15000 + 2008-11-30 Robin Cook <rcook@wyrms.net> * DETAILS: updated VERSION to 2.24.1 diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY index 995a35846b..a9da311c1e 100644 --- a/gnome2-apps/epiphany/HISTORY +++ b/gnome2-apps/epiphany/HISTORY @@ -1,3 +1,7 @@ +2009-01-03 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * REPAIR^2323d34d: added repair file for the PRE_SUB_DEPENDS change + * {PRE_,}SUB_DEPENDS: made the subdeps uppercase #15000 + 2008-11-26 George Sherwood <gsherwood@sourcemage.org> * DETAILS: Updated to version 2.24.2.1 diff --git a/gnome2-apps/epiphany/PRE_SUB_DEPENDS b/gnome2-apps/epiphany/PRE_SUB_DEPENDS index d7760b58a9..b84d6afd96 100755 --- a/gnome2-apps/epiphany/PRE_SUB_DEPENDS +++ b/gnome2-apps/epiphany/PRE_SUB_DEPENDS @@ -1,4 +1,4 @@ case $THIS_SUB_DEPENDS in - gnome-python2) is_depends_enabled $SPELL gnome-python2 ;; + gnome-python2|GNOME-PYTHON2) is_depends_enabled $SPELL gnome-python2 ;; *) message "${PROBLEM_COLOR}bogus sub_depends: ${SPELL} ${THIS_SUB_DEPENDS}${DEFAULT_COLOR}" && return 1 ;; esac diff --git a/gnome2-apps/epiphany/REPAIR^2323d34df38f16d5b05e4b7923733c07^PRE_SUB_DEPENDS b/gnome2-apps/epiphany/REPAIR^2323d34df38f16d5b05e4b7923733c07^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..a90912bb8f --- /dev/null +++ b/gnome2-apps/epiphany/REPAIR^2323d34df38f16d5b05e4b7923733c07^PRE_SUB_DEPENDS @@ -0,0 +1,4 @@ +case $THIS_SUB_DEPENDS in + GNOME-PYTHON2) is_depends_enabled $SPELL gnome-python2 ;; + *) message "${PROBLEM_COLOR}bogus sub_depends: ${SPELL} ${THIS_SUB_DEPENDS}${DEFAULT_COLOR}" && return 1 ;; +esac diff --git a/gnome2-apps/epiphany/SUB_DEPENDS b/gnome2-apps/epiphany/SUB_DEPENDS index 5f6ca46a04..ca1b636fe3 100755 --- a/gnome2-apps/epiphany/SUB_DEPENDS +++ b/gnome2-apps/epiphany/SUB_DEPENDS @@ -1,4 +1,4 @@ case $THIS_SUB_DEPENDS in -gnome-python2) echo "python bindings requested, forcing them."; depends gnome-python2 '--enable-python';; +gnome-python2|GNOME-PYTHON2) echo "python bindings requested, forcing them."; depends gnome-python2 '--enable-python';; *) echo "unknown sub-depends!"; return 1;; esac diff --git a/kde4-apps/amarok2/DEPENDS b/kde4-apps/amarok2/DEPENDS index 4b87cb8ada..db2724248b 100755 --- a/kde4-apps/amarok2/DEPENDS +++ b/kde4-apps/amarok2/DEPENDS @@ -2,7 +2,7 @@ source $SECTION_DIRECTORY/KDE_DEPENDS && if [[ $AMR_SVN == y ]];then depends subversion fi && -depends mysql && +depends -sub embedded mysql && optional_depends faac '' '' 'for M4A/AAC/MP4 tag support' && optional_depends libvisual '' '' 'to use libvisual plugins' && optional_depends gstreamer '' '' 'GStreamer support' && diff --git a/kde4-apps/amarok2/HISTORY b/kde4-apps/amarok2/HISTORY index dda3cdc185..b0461c1a8b 100644 --- a/kde4-apps/amarok2/HISTORY +++ b/kde4-apps/amarok2/HISTORY @@ -1,3 +1,6 @@ +2009-01-03 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * DEPENDS: needs mysql with the embedded server #14994 + 2008-12-10 Julien "_kaze_" ROZO <julien@rozo.org> * DETAILS: updated version to 2.0 diff --git a/python-pypi/sqlobject/DEPENDS b/python-pypi/sqlobject/DEPENDS index 612090005b..5d70c816c9 100755 --- a/python-pypi/sqlobject/DEPENDS +++ b/python-pypi/sqlobject/DEPENDS @@ -1,4 +1,5 @@ depends python && +depends setuptools && depends formencode && suggest_depends kinterbasdb "firebird support" && suggest_depends mysql-python "MySQL support" && diff --git a/python-pypi/sqlobject/HISTORY b/python-pypi/sqlobject/HISTORY index 78f7bcf31b..0edf8ac9fe 100644 --- a/python-pypi/sqlobject/HISTORY +++ b/python-pypi/sqlobject/HISTORY @@ -1,3 +1,6 @@ +2009-01-03 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * DEPENDS: added missing setuptools #15001 + 2008-12-08 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.10.4 diff --git a/utils/gpm/DETAILS b/utils/gpm/DETAILS index 12f60f32c6..5bf7678b1e 100755 --- a/utils/gpm/DETAILS +++ b/utils/gpm/DETAILS @@ -1,13 +1,11 @@ SPELL=gpm - VERSION=1.20.1 + VERSION=1.20.5 SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_HASH=sha512:876caa90a5bcda10a6c25656e0239dc5147ae34ad9db56c4b13c00bc1a178ed6198af3bbfdda11ebed5fe25312cf83af9b27ea7529024503d80cfcf073ffc8fe + SOURCE_HASH=sha512:34ac9e649cfd09eb2d6a5af85b829032e257ae0cac30e28afb968e3772d37e187b991b5cc2cc7d6c025baf6f5925dbb820a98bf4a97c3fd12f6a8198f6193cc5 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=ftp://arcana.linux.it/pub/$SPELL/$SOURCE - SOURCE_URL[1]=ftp://ftp.schottelius.org/pub/linux/$SPELL/$SOURCE + SOURCE_URL[0]=http://linux.schottelius.org/gpm/archives/$SOURCE WEB_SITE=http://linux.schottelius.org/gpm/ ENTERED=20011003 - UPDATED=20030822 KEYWORDS="utils" SHORT="GPM is a mouse server for the console and xterm" cat << EOF diff --git a/utils/gpm/HISTORY b/utils/gpm/HISTORY index 402c445492..5c3b06cbed 100644 --- a/utils/gpm/HISTORY +++ b/utils/gpm/HISTORY @@ -1,3 +1,11 @@ +2009-01-03 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * gpm-OPEN_MAX-2.patch: removed, no longer needed + * gpm-OPEN_MAX-1.patch: removed, no longer needed + * PRE_BUILD: removed, no longer needed + * gpm.1.20.1-pts.patch: removed, no longer needed + * DETAILS: Fixed SOURCE_URL[0] + updated spell to 1.20.5 + 2007-12-01 Eric Sandall <sandalle@sourcemage.org> * PRE_BUILD: Apply gpm-OPEN_MAX-1.patch and gpm-OPEN_MAX-2.patch (Bug #14109) diff --git a/utils/gpm/PRE_BUILD b/utils/gpm/PRE_BUILD deleted file mode 100755 index 5a905fdfc9..0000000000 --- a/utils/gpm/PRE_BUILD +++ /dev/null @@ -1,7 +0,0 @@ -default_pre_build && -patch $SOURCE_DIRECTORY/src/lib/liblow.c \ - $SCRIPT_DIRECTORY/gpm.1.20.1-pts.patch && -patch $SOURCE_DIRECTORY/src/prog/gpm-root.y \ - $SCRIPT_DIRECTORY/gpm-OPEN_MAX-1.patch && -patch $SOURCE_DIRECTORY/src/special.c \ - $SCRIPT_DIRECTORY/gpm-OPEN_MAX-2.patch diff --git a/utils/gpm/gpm-OPEN_MAX-1.patch b/utils/gpm/gpm-OPEN_MAX-1.patch deleted file mode 100644 index b3be5f0fd1..0000000000 --- a/utils/gpm/gpm-OPEN_MAX-1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur gpm-1.20.1.orig/src/prog/gpm-root.y gpm-1.20.1/src/prog/gpm-root.y ---- gpm-1.20.1.orig/src/prog/gpm-root.y 2007-12-01 01:32:11.225537231 -0800 -+++ gpm-1.20.1/src/prog/gpm-root.y 2007-12-01 01:33:21.339840854 -0800 -@@ -525,7 +525,9 @@ - open("/dev/null",O_RDONLY); /* stdin */ - open(consolename,O_WRONLY); /* stdout */ - dup(1); /* stderr */ -- for (i=3;i<OPEN_MAX; i++) close(i); -+ int open_max = sysconf(_SC_OPEN_MAX); -+ if (open_max == -1) open_max = 1024; -+ for (i=3;i<open_max; i++) close(i); - execl("/bin/sh","sh","-c",self->arg,(char *)NULL); - exit(1); /* shouldn't happen */ - default: return 0; diff --git a/utils/gpm/gpm-OPEN_MAX-2.patch b/utils/gpm/gpm-OPEN_MAX-2.patch deleted file mode 100644 index 502d62447c..0000000000 --- a/utils/gpm/gpm-OPEN_MAX-2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur gpm-1.20.1.orig/src/special.c gpm-1.20.1/src/special.c ---- gpm-1.20.1.orig/src/special.c 2007-12-01 01:32:11.225537231 -0800 -+++ gpm-1.20.1/src/special.c 2007-12-01 01:34:00.774824800 -0800 -@@ -155,7 +155,9 @@ - open(GPM_NULL_DEV,O_RDONLY); /* stdin */ - open(option.consolename,O_WRONLY); /* stdout */ - dup(1); /* stderr */ -- for (i=3;i<OPEN_MAX; i++) close(i); -+ int open_max = sysconf(_SC_OPEN_MAX); -+ if (open_max == -1) open_max = 1024; -+ for (i=3;i<open_max; i++) close(i); - execl("/bin/sh","sh","-c",command,(char *)NULL); - exit(1); /* shouldn't happen */ - diff --git a/utils/gpm/gpm.1.20.1-pts.patch b/utils/gpm/gpm.1.20.1-pts.patch deleted file mode 100644 index 28341cadc7..0000000000 --- a/utils/gpm/gpm.1.20.1-pts.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur gpm-1.20.1.orig/src/lib/liblow.c gpm-1.20.1/src/lib/liblow.c ---- gpm-1.20.1.orig/src/lib/liblow.c 2005-07-30 13:19:07.969733048 -0700 -+++ gpm-1.20.1/src/lib/liblow.c 2005-07-30 13:19:31.889096752 -0700 -@@ -199,7 +199,8 @@ - Gpm_Stst *new = NULL; - char* sock_name = 0; - -- option.consolename = NULL; -+ if (!checked_con) -+ option.consolename = NULL; - - gpm_report(GPM_PR_DEBUG,"VC: %d",flag); - diff --git a/utils/strigi/DETAILS b/utils/strigi/DETAILS index cea36ee67e..fd3a865ffa 100755 --- a/utils/strigi/DETAILS +++ b/utils/strigi/DETAILS @@ -12,14 +12,13 @@ fi SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk//kdesupport/$SPELL:$SPELL SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL else - VERSION=0.5.11 - SOURCE_HASH=sha512:a0b9f8db1303c71b9bfb9a658b542ab31e9e68b2ec9bce4026325e8208ea1a8a87eafeadf84878ae33e37ca92406456e66eb06800d4c3e3326081393a8579258 + VERSION=0.6.2 + SOURCE_HASH=sha512:3b05e25c1b5821563bccda658cc349f9025f4355d9aa94da6fab47341309b26b83d101d467198c2242d1859c8db4c487ae783cd96167196f20737f2535fb660d SOURCE=$SPELL-$VERSION.tar.bz2 # SOURCE_URL[0]=$KDE_URL/unstable/${KDEVER//.0}/src/$SOURCE SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE SOURCE_URL[0]=http://www.vandenoever.info/software/strigi/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - PATCHLEVEL=1 fi WEB_SITE=http://strigi.sourceforge.net/ LICENSE[0]=LGPL diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY index dd5763208b..3432e38a0e 100644 --- a/utils/strigi/HISTORY +++ b/utils/strigi/HISTORY @@ -1,3 +1,6 @@ +2009-01-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 0.6.2 + 2008-11-24 Treeve Jelbert <treeve@sourcemage.org> * BUILD: qt4_build -> qt4_cmake_build |