Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (6a8585cd57d4580087f5f3eb4771fc821edb3f27)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (6a8585cd57d4580087f5f3eb4771fc821edb3f27)
  • Date: Fri, 25 May 2012 06:39:43 -0500

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

ChangeLog | 6 ++++++
gnu.gpg |binary
libs/tzdata/HISTORY | 4 ++++
libs/tzdata/INSTALL | 4 ++--
lua-forge/lua/BUILD | 4 ++++
lua-forge/lua/HISTORY | 3 +++
lua-forge/lua51/HISTORY | 3 +++
lua-forge/lua51/PRE_BUILD | 4 ++++
net/libproxy/DEPENDS | 5 +++--
net/libproxy/HISTORY | 3 +++
ruby-raa/ruby-1.8/DETAILS | 9 ++++-----
ruby-raa/ruby-1.8/HISTORY | 4 ++++
spelling/aspell-en/DETAILS | 2 +-
spelling/aspell-en/HISTORY | 3 +++
utils/gnuplot/BUILD | 4 ----
utils/gnuplot/DEPENDS | 7 +++++--
utils/gnuplot/DETAILS | 4 ++--
utils/gnuplot/FINAL | 2 +-
utils/gnuplot/HISTORY | 6 ++++++
utils/gnuplot/INSTALL | 8 --------
utils/gnuplot/POST_REMOVE | 2 +-
utils/gnuplot/PRE_BUILD | 17 ++++++++++-------
utils/gnuplot/crossbuild.patch | 14 ++++++++++++++
23 files changed, 83 insertions(+), 35 deletions(-)

New commits:
commit b385c09c4778ef0ad823539fddee376bebfc5191
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ruby-1.8: => 1.8.7-p358 (security)

commit d75dc430c3173851b12b3520601074abdeec6648
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libproxy: added missing opt deps

commit 21f562a4a2be16207694ff57a4dd4e33cedf1481
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

gnuplot: bump to 4.6 and fixup

commit 58221816fcbfad9ccb04bbca920fd96b3a71ae7f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

ChangLog: forgot to add additions to gnu.gpg and kernel.gpg
relevant commits are:
ff89247d36d1f89017f0164788bf434fec2b5c6f -
gnu.gpg: added 5B147849: public key "Aspell Dictionary Upload
<dict-upload AT aspell.net>"
& 7084d80b203bae09e8ba22abcd9aca746cb0eb91 -
kernel.gpg: 6092693E Greg Kroah-Hartman (Linux kernel stable release
signing key)

commit 46e6e242329849ccdc741bb309bb1154951df9e1
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

lua: if x86_64, force fPIC CFLAG

commit 1609c4bcfbcf528203ac5da2d93a2b2395c2ec42
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

lua51: if x86_64, force fPIC CFLAG

commit cc6b50a121271ada93197277ab043e9d9bdf12ae
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

tzdata: $SCRIPT_DIRECTORY -> $SPELL_DIRECTORY
fixed spelling error in INSTALL: TIme -> Time

commit 7a5a5e88886e5befc498f9f66e262cfaf3a6878b
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

aspell-en: => 7.1-0

commit 6ff777b7049002dde1333050ffe48d4d61f6e8b1
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

xfce/libxfcegui4: version 4.10.0

commit ff89247d36d1f89017f0164788bf434fec2b5c6f
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

gnu.gpg: added 5B147849: public key "Aspell Dictionary Upload
<dict-upload AT aspell.net>"

diff --git a/ChangeLog b/ChangeLog
index 1a1b889..426f81e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-25 Sukneet Basuta <sukneet AT sourcemage.org>
+ * gnu.gpg: added 5B147849: public key for "Aspell Dictionary
+ Upload <dict-upload AT aspell.net>"
+ * kernel.gpg: added (on 2012-05-15) 6092693E Greg Kroah-Hartman
+ (Linux kernel stable release signing key)
+
2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
* net/tor.gpg: added 19F78451 public key (Roger Dingledine
<arma AT mit.edu>)
diff --git a/gnu.gpg b/gnu.gpg
index 7b8123b..c90e247 100644
Binary files a/gnu.gpg and b/gnu.gpg differ
diff --git a/libs/tzdata/HISTORY b/libs/tzdata/HISTORY
index 368cf4d..640dbbb 100644
--- a/libs/tzdata/HISTORY
+++ b/libs/tzdata/HISTORY
@@ -1,3 +1,7 @@
+2012-05-24 Sukneet Basuta <sukneet AT sourcemage.org>
+ * INSTALL: $SCRIPT_DIRECTORY -> $SPELL_DIRECTORY
+ TIme -> Time
+
2012-05-22 Sukneet Basuta <sukneet AT sourcemage.org>
* CONFIGURE: add config_query to ask if sorcery should manage
/etc/localtime
* INSTALL: only install local timezone if requested to
diff --git a/libs/tzdata/INSTALL b/libs/tzdata/INSTALL
index 7e953ff..5099e8d 100755
--- a/libs/tzdata/INSTALL
+++ b/libs/tzdata/INSTALL
@@ -10,7 +10,7 @@ if [ -d ${INSTALL_ROOT}/usr/share/zoneinfo ]; then
if [ -e $FILE ]; then
rm ${INSTALL_ROOT}/$FILE
fi
- done < ${SCRIPT_DIRECTORY}/hard_linked_files
+ done < ${SPELL_DIRECTORY}/hard_linked_files
fi &&


@@ -26,7 +26,7 @@ if [ $SET_LOCALTIME == "y" ]; then
if [ -z "$LOCAL_TIMEZONE" ]; then
LOCAL_TIMEZONE="UTC"
fi &&
- echo "Local TIme Zone: " $LOCAL_TIMEZONE
&&
+ echo "Local Time Zone: " $LOCAL_TIMEZONE
&&

# zic -l breaks if /etc and /usr are on different partitions
#zic -y ./yearistype -d ${INSTALL_ROOT}/usr/share/zoneinfo -l
"$LOCAL_TIMEZONE" &&
diff --git a/lua-forge/lua/BUILD b/lua-forge/lua/BUILD
index 24153e7..e649d23 100755
--- a/lua-forge/lua/BUILD
+++ b/lua-forge/lua/BUILD
@@ -1,3 +1,7 @@
+if [ "${SMGL_COMPAT_ARCHS[1]}" ]; then
+ CFLAGS="${CFLAGS} -fPIC"
+fi &&
+
make CFLAGS="-DLUA_USE_POSIX \
-DLUA_USE_DLOPEN \
-DLUA_COMPAT_MODULE \
diff --git a/lua-forge/lua/HISTORY b/lua-forge/lua/HISTORY
index 4773505..ef0b3a7 100644
--- a/lua-forge/lua/HISTORY
+++ b/lua-forge/lua/HISTORY
@@ -1,3 +1,6 @@
+2012-05-25 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: if x86_64, force fPIC CFLAG
+
2011-12-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* BUILD: added flags for loading DSO, old plugin compatibility
diff --git a/lua-forge/lua51/HISTORY b/lua-forge/lua51/HISTORY
index 2688e46..67ec91d 100644
--- a/lua-forge/lua51/HISTORY
+++ b/lua-forge/lua51/HISTORY
@@ -1,3 +1,6 @@
+2012-05-25 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: if x86_64, force fPIC CFLAG
+
2012-01-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* INSTALL: create liblua.so symlink

diff --git a/lua-forge/lua51/PRE_BUILD b/lua-forge/lua51/PRE_BUILD
index e2aa249..b9dca08 100755
--- a/lua-forge/lua51/PRE_BUILD
+++ b/lua-forge/lua51/PRE_BUILD
@@ -12,6 +12,10 @@ sed -i "s:/usr/local:$INSTALL_ROOT/usr:" etc/lua.pc
src/luaconf.h Makefile &&
# fix man-installation path
sed -i "s:man/:share/man/:" etc/lua.pc Makefile &&

+if [ "${SMGL_COMPAT_ARCHS[1]}" ]; then
+ CFLAGS="${CFLAGS} -fPIC"
+fi &&
+
# use custom compiling/linking flags
sed -i "s:^CFLAGS=.*:CFLAGS=${CFLAGS} \$(MYCFLAGS):" src/Makefile &&
sed -i "s:MYLDFLAGS=.*:MYLDFLAGS=${LDFLAGS}:" src/Makefile
diff --git a/net/libproxy/DEPENDS b/net/libproxy/DEPENDS
index d403840..388756e 100755
--- a/net/libproxy/DEPENDS
+++ b/net/libproxy/DEPENDS
@@ -12,5 +12,6 @@ fi &&
optional_depends kdelibs4 '-DWITH_KDE4=1' '-DWITH_KDE4=0' 'KDE integration'
&&
optional_depends glib2 '-DWITH_GNOME3=1' '-DWITH_GNOME3=0' 'Gnome
support' &&
optional_depends xulrunner '' '' 'Mozilla support' &&
-optional_depends python '' '' "for Python bindings"
-
+optional_depends vala '-DWITH_VALA=1' '-DWITH_VALA=0' "for Vala
bindings" &&
+optional_depends perl '-DWITH_PERL=1' '-DWITH_PERL=0' "for Perl
bindings" &&
+optional_depends python '-DWITH_PYTHON=1' '-DWITH_PYTHON=0' "for Python
bindings"
diff --git a/net/libproxy/HISTORY b/net/libproxy/HISTORY
index 2016cfd..4d8cbab 100644
--- a/net/libproxy/HISTORY
+++ b/net/libproxy/HISTORY
@@ -1,3 +1,6 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing opt deps and flags
+
2012-03-10 Robin Cook <rcook AT wyrms.net>
* CONFIGURE: added option for which webkitgtk to use
* DEPENDS: changed to use configure option
diff --git a/ruby-raa/ruby-1.8/DETAILS b/ruby-raa/ruby-1.8/DETAILS
index ee3aa29..864be02 100755
--- a/ruby-raa/ruby-1.8/DETAILS
+++ b/ruby-raa/ruby-1.8/DETAILS
@@ -1,11 +1,10 @@
SPELL=ruby-1.8
PACKAGE=ruby
- VERSION=1.8.7-p352
+ VERSION=1.8.7-p358
SOURCE=$PACKAGE-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:30ac829da3cbddecb85318662780bca627eab72cad97882eac1ab20678d9609d603cfa9e33a80d701f7112a3445d94b2c8ce5ad82a6865ef86387d931d0a6a3d
- SECURITY_PATCH=9
- SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/stable/$SOURCE
- SOURCE_URL[1]=ftp://www.ibiblio.org/pub/languages/ruby/$SOURCE
+
SOURCE_HASH=sha512:f5d3729cbf869ee8d24a8d73008de8591d7d3fbee7a935c3cd69f755008243e821e53405b1a62e46d6af847a749c73e7463aede091d63ff43e5b1e01ecf06199
+ SECURITY_PATCH=10
+ SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$PACKAGE-$VERSION"
LICENSE[0]=GPL
KEYWORDS="devel"
diff --git a/ruby-raa/ruby-1.8/HISTORY b/ruby-raa/ruby-1.8/HISTORY
index cf01e63..106030e 100644
--- a/ruby-raa/ruby-1.8/HISTORY
+++ b/ruby-raa/ruby-1.8/HISTORY
@@ -1,3 +1,7 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.7-p358; SECURITY_PATCH++; updated
+ mirrorlist
+
2011-07-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.7-p352
SECURITY_PATCH++ (includes p334 patch for FileUtils vulnerability)
diff --git a/spelling/aspell-en/DETAILS b/spelling/aspell-en/DETAILS
index e4ece63..3602fbe 100755
--- a/spelling/aspell-en/DETAILS
+++ b/spelling/aspell-en/DETAILS
@@ -2,7 +2,7 @@
ASPELL_BRANCH=6
DICTIONARY_SPELL=`echo ${SPELL} | cut -d - -f 1`
LANGUAGE_CODE=`echo ${SPELL} | cut -d - -f 2`
- VERSION=6.0-0
+ VERSION=7.1-0

SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${DICTIONARY_SPELL}${ASPELL_BRANCH}-${LANGUAGE_CODE}-${VERSION}

SOURCE=${DICTIONARY_SPELL}${ASPELL_BRANCH}-${LANGUAGE_CODE}-${VERSION}.tar.bz2

SOURCE_URL=${GNU_URL}/${DICTIONARY_SPELL}/dict/${LANGUAGE_CODE}/${SOURCE}
diff --git a/spelling/aspell-en/HISTORY b/spelling/aspell-en/HISTORY
index a89d97b..e6c6483 100644
--- a/spelling/aspell-en/HISTORY
+++ b/spelling/aspell-en/HISTORY
@@ -1,3 +1,6 @@
+2012-05-24 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 7.1-0
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/utils/gnuplot/BUILD b/utils/gnuplot/BUILD
index 95ff7a2..5937f40 100755
--- a/utils/gnuplot/BUILD
+++ b/utils/gnuplot/BUILD
@@ -1,6 +1,2 @@
OPTS="--without-tutorial $OPTS" &&
-
-if [[ $GNUPLOT_BRANCH == scm ]]; then
- ./prepare
-fi &&
default_build
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index 2d36ccf..c84f63e 100755
--- a/utils/gnuplot/DEPENDS
+++ b/utils/gnuplot/DEPENDS
@@ -13,7 +13,7 @@ optional_depends "readline"
\
"use gnu readline instead of builtin readline" &&

optional_depends xorg-libs --with-x --without-x "X11 output" &&
-optional_depends wxgtk --enable-wxwidgets --disable-wxwidgets \
+optional_depends wxgtk --enable-wxt --disable-wxt \
"wxWidgets interactive terminal" &&

optional_depends svgalib \
@@ -21,12 +21,15 @@ optional_depends svgalib \
"--without-linux-vga" \
"Linux SVGA console driver?" &&

-optional_depends lua51 "--with-lua" "--without-lua" \
+optional_depends lua "--with-lua" "--without-lua" \
"lua/TikZ terminal" &&

optional_depends cairo "--with-cairo" "--without-cairo" \
"cairo-based terminals" &&

+optional_depends qt4 "--enable-qt" "--disable-qt" \
+ "Qt-based interactive terminal" &&
+
if is_depends_enabled $SPELL wxgtk; then
depends cairo &&
depends pango
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index 7b69eaf..7e4552b 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -11,11 +11,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot
SOURCE_IGNORE=volatile
else
- VERSION=4.4.3
+ VERSION=4.6.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:dc520e8074e00f8ba346451ca9e229c31907735185f0ed4ae066ad5f2caa799db04c28181729bef1af467af7341f3b721eba8a0d5ecd6988c5740351fe002fd6
+
SOURCE_HASH=sha512:a4358c20577f978215a22db041f4d369ab69a88624b2fe831d2a1124fffb84d4dafa7f0f5a8bfdb388c663073570adb084949195c6eebd0f11f9b0ac4485debc
fi
WEB_SITE=http://www.gnuplot.info
ENTERED=20020210
diff --git a/utils/gnuplot/FINAL b/utils/gnuplot/FINAL
index ab6596a..39f9e3d 100755
--- a/utils/gnuplot/FINAL
+++ b/utils/gnuplot/FINAL
@@ -1,3 +1,3 @@
-if [[ $GNUPLOT_LUA == "y" ]]; then
+if is_depends_enabled $SPELL lua; then
texhash
fi
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index eeab61b..a13ecd9 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,9 @@
+2012-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 4.6
+ * PRE_BUILD, BUILD, crossbuild.patch, FINAL, INSTALL, POST_REMOVE:
+ fix build and clean up the mess for Lua terminals that are upstream
now
+ * DEPENDS: add qt4
+
2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: lua -> lua51

diff --git a/utils/gnuplot/INSTALL b/utils/gnuplot/INSTALL
deleted file mode 100755
index 93b8063..0000000
--- a/utils/gnuplot/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-make install-strip &&
-if [[ $GNUPLOT_LUA == "y" ]]; then
- mkdir -p ${INSTALL_ROOT}/usr/share/texmf/tex/generic/gnuplot-lua-tikz &&
- cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/*.sty \
- $INSTALL_ROOT/usr/share/texmf/tex/generic/gnuplot-lua-tikz &&
- cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/gnuplot.lua \
- $INSTALL_ROOT/usr/libexec/gnuplot/4.2/gnuplot.lua
-fi
diff --git a/utils/gnuplot/POST_REMOVE b/utils/gnuplot/POST_REMOVE
index ab6596a..39f9e3d 100755
--- a/utils/gnuplot/POST_REMOVE
+++ b/utils/gnuplot/POST_REMOVE
@@ -1,3 +1,3 @@
-if [[ $GNUPLOT_LUA == "y" ]]; then
+if is_depends_enabled $SPELL lua; then
texhash
fi
diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD
index 6c01f68..af643b4 100755
--- a/utils/gnuplot/PRE_BUILD
+++ b/utils/gnuplot/PRE_BUILD
@@ -1,9 +1,12 @@
default_pre_build &&
-if [[ $GNUPLOT_LUA == "y" ]]; then
- cd $SOURCE_DIRECTORY &&
- unpack_file 2 &&
- cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/lua.trm \
- $SOURCE_DIRECTORY/term &&
- echo '#include "lua.trm"' >> $SOURCE_DIRECTORY/src/term.h &&
- sedit 's/^LIBS = /LIBS = -llua /' $SOURCE_DIRECTORY/src/Makefile.in
+cd "$SOURCE_DIRECTORY" &&
+# Fix build that thinks we are cross-compiling.
+# Hopefully fixed in gnuplot 4.7 .
+patch -Np0 < "$SPELL_DIRECTORY/crossbuild.patch" &&
+
+# remove the true when removing the patch above
+if true || [[ $GNUPLOT_BRANCH == scm ]]; then
+ cd "$SOURCE_DIRECTORY" &&
+ autoreconf -iv
fi
+
diff --git a/utils/gnuplot/crossbuild.patch b/utils/gnuplot/crossbuild.patch
new file mode 100644
index 0000000..2235abe
--- /dev/null
+++ b/utils/gnuplot/crossbuild.patch
@@ -0,0 +1,14 @@
+--- configure.in.orig 2012-05-25 09:37:33.000000000 +0200
++++ configure.in 2012-05-25 09:40:29.000000000 +0200
+@@ -31,6 +31,11 @@
+ AC_C_STRINGIZE
+ AC_PROG_LN_S
+
++# hack to avoid false alarm for cross build
++# should not be needed!
++test -z "${build}" && build="${host}"
++test -z "${host}" && host="${build}"
++
+ if test "${build}" != "${host}"
+ then
+ CC=${CC-${host_alias}-gcc}



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (6a8585cd57d4580087f5f3eb4771fc821edb3f27), Vlad Glagolev, 05/25/2012

Archive powered by MHonArc 2.6.24.

Top of Page