Skip to Content.
Sympa Menu

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

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 (b7666b75c008d236f732a9f7a5d1f9b80f28e2c5)
  • Date: Tue, 8 Nov 2011 02:46:20 -0600

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

dev/null |binary
graphics/mcomix/DETAILS | 4 -
graphics/mcomix/HISTORY | 4 +
graphics/mcomix/mcomix-0.95.tar.bz2.sig |binary
http/firefox/DETAILS | 18 ++----
http/firefox/HISTORY | 12 ++++
http/firefox/INSTALL | 4 -
http/firefox/PRE_BUILD | 8 +--
http/firefox/curl.patch | 84
--------------------------------
http/firefox/glyph.patch | 2
http/firefox/install_dir.patch | 28 ++++++++++
libs/gmime/DETAILS | 2
libs/gmime/HISTORY | 3 +
libs/gmime/gmime-2.4.26.tar.bz2.sig | 0
libs/gmime/gmime-2.4.28.tar.bz2.sig |binary
python-pypi/fabric/DETAILS | 4 -
python-pypi/fabric/HISTORY | 3 +
python-pypi/pycrypto/DETAILS | 2
python-pypi/pycrypto/HISTORY | 3 +
python-pypi/python-ssh/DETAILS | 4 -
python-pypi/python-ssh/HISTORY | 4 +
python-pypi/python-ssh/PRE_BUILD | 4 -
science/viking/DETAILS | 4 -
science/viking/HISTORY | 4 +
science/viking/PRE_BUILD | 2
science/viking/curl_types.patch | 24 ---------
26 files changed, 83 insertions(+), 144 deletions(-)

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

python-ssh: => 1.7.9

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

fabric: => 1.3.2

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

pycrypto: => 2.4.1

commit 27e7f18a5c07b1ab55e0a2bac4c4c2e601ffeafa
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

viking: updated spell to 1.2.2

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

firefox: remove symlink creation of /usr/lib/firefox
since it is patched to install /usr/lib/firefox anyway

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

firefox: => 8.0
switched back to gpg verification (not sure why it was removed in the
first place)
removed curl.patch, no longer needed fixed in upstream
added install_dir.patch to install to /usr/lib/firefox so you don't need
to keep reinstalling plugins on upgrades

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

gmime: => 2.4.28

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

mcomix: => 0.95
switched to guru signed gpg verification

diff --git a/graphics/mcomix/DETAILS b/graphics/mcomix/DETAILS
index 903d544..7db9973 100755
--- a/graphics/mcomix/DETAILS
+++ b/graphics/mcomix/DETAILS
@@ -1,8 +1,8 @@
SPELL=mcomix
- VERSION=0.91
+ VERSION=0.95
SOURCE="${SPELL}-${VERSION}.tar.bz2"

SOURCE_URL[0]=http://sourceforge.net/projects/${SPELL}/files/MComix-${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:e01c77463834b29bca5f30d45d367f3c44adac74f63f914501cdcadb1d2e09a3d787311e1a8e666316d9890322a5480ed42ce3ca2abd4c80901474fc6ca1ee61
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://sourceforge.net/projects/mcomix/";
LICENSE[0]="GPL"
diff --git a/graphics/mcomix/HISTORY b/graphics/mcomix/HISTORY
index e88be14..eb163d7 100644
--- a/graphics/mcomix/HISTORY
+++ b/graphics/mcomix/HISTORY
@@ -1,3 +1,7 @@
+2011-11-07 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.95
+ switched to guru gpg verification
+
2011-05-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider

diff --git a/graphics/mcomix/mcomix-0.95.tar.bz2.sig
b/graphics/mcomix/mcomix-0.95.tar.bz2.sig
new file mode 100644
index 0000000..2fa6d9e
Binary files /dev/null and b/graphics/mcomix/mcomix-0.95.tar.bz2.sig differ
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index cb478c1..1b33e96 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,22 +1,18 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=7.0.1
+ VERSION=8.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:ddfb9deb8cdc6fd325119db2a829e698c05f3fccd8d5764455a87c795ea5921bac4d64435d40d007075b306fdcac99e65ad8ca1e6e94a8025c42de91b2142d4e
-# SOURCE2=$SOURCE.asc
-# SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2=$SOURCE.asc
+ SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=7.0.1
+ VERSION=8.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:ddfb9deb8cdc6fd325119db2a829e698c05f3fccd8d5764455a87c795ea5921bac4d64435d40d007075b306fdcac99e65ad8ca1e6e94a8025c42de91b2142d4e
-# SOURCE2=$SOURCE.asc
-# SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2=$SOURCE.asc
+ SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
-
SOURCE_URL[1]=ftp://ftp.access.ch/mirror/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
-
SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
- SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
+
SOURCE_URL[1]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
SECURITY_PATCH=41
fi
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index defed9d..fbb145a 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,15 @@
+2011-11-07 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 8.0
+ removed SOURCE_URL[1], dead
+ removed SOURCE_URL[3], no longer updated
+ switched back to gpg verification
+ * PRE_BUILD: removed curl.patch, no longer needed
+ added install_dir.patch to install to /usr/lib/firefox
+ so you don't need to keep reinstalling plugins on upgrades
+ * curl.patch: removed, fixed in upstream
+ * glyph.patch: updated
+ * install_dir.patch: added, drops release number from install path
+
2011-09-30 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 7.0.1

diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 17466d9..87aa190 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -8,10 +8,6 @@ fi &&

make -f client.mk install &&

-
-ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox
-
-
#
# Script to set MOZILLA_FIVE_HOME
#
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 635e323..f62a6d3 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -3,14 +3,14 @@ cd $SOURCE_DIRECTORY &&
unpack_file '' &&
cd mozilla* &&

-#Fix compilation with curl-7.21.7
-# https://bug673072.bugzilla.mozilla.org/attachment.cgi?id=547353
-patch -p0 < $SPELL_DIRECTORY/curl.patch &&
-
#Fedora patch to remove glyph in title bar
# http://osdir.com/ml/scm-fedora-commits/2011-06/msg10320.html
patch -p0 < $SPELL_DIRECTORY/glyph.patch &&

+# Archlinux patch to drop release point from install path
+#
http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
+patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&
+
cp -v $SPELL_DIRECTORY/mozconfig5 .mozconfig &&

if [[ "$FIREFOX_SAFE" == "y" ]]; then
diff --git a/http/firefox/curl.patch b/http/firefox/curl.patch
deleted file mode 100644
index 66b90cc..0000000
--- a/http/firefox/curl.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -r 15b32ce27a28 config/system-headers
---- config/system-headers Thu Jul 21 20:50:16 2011 +1200
-+++ config/system-headers Thu Jul 21 21:28:49 2011 +1200
-@@ -199,17 +199,16 @@ crypt.h
- cstddef
- cstdio
- cstdlib
- cstring
- ctime
- ctype.h
- curl/curl.h
- curl/easy.h
--curl/types.h
- curses.h
- cxxabi.h
- DateTimeUtils.h
- dbus/dbus.h
- dbus/dbus-glib.h
- dbus/dbus-glib-lowlevel.h
- ddeml.h
- Debug.h
-diff -r 15b32ce27a28 js/src/config/system-headers
---- js/src/config/system-headers Thu Jul 21 20:50:16 2011 +1200
-+++ js/src/config/system-headers Thu Jul 21 21:28:49 2011 +1200
-@@ -199,17 +199,16 @@ crypt.h
- cstddef
- cstdio
- cstdlib
- cstring
- ctime
- ctype.h
- curl/curl.h
- curl/easy.h
--curl/types.h
- curses.h
- cxxabi.h
- DateTimeUtils.h
- dbus/dbus.h
- dbus/dbus-glib.h
- dbus/dbus-glib-lowlevel.h
- ddeml.h
- Debug.h
-diff -r 15b32ce27a28
toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
---- toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
Thu Jul 21 20:50:16 2011 +1200
-+++ toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
Thu Jul 21 21:28:49 2011 +1200
-@@ -28,17 +28,16 @@
- // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- #include "common/linux/http_upload.h"
-
- #include <assert.h>
- #include <dlfcn.h>
- #include <curl/curl.h>
- #include <curl/easy.h>
--#include <curl/types.h>
-
- namespace {
-
- // Callback to get the response data from server.
- static size_t WriteCallback(void *ptr, size_t size,
- size_t nmemb, void *userp) {
- if (!userp)
- return 0;
-diff -r 15b32ce27a28
toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
----
toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
Thu Jul 21 20:50:16 2011 +1200
-+++
toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
Thu Jul 21 21:28:49 2011 +1200
-@@ -24,17 +24,16 @@
- // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- #include <curl/curl.h>
- #include <curl/easy.h>
--#include <curl/types.h>
- #include <dlfcn.h>
-
- #include <iostream>
- #include <string>
-
- #include "common/linux/libcurl_wrapper.h"
-
- using std::string;
diff --git a/http/firefox/glyph.patch b/http/firefox/glyph.patch
index 420205c..58b2e97 100644
--- a/http/firefox/glyph.patch
+++ b/http/firefox/glyph.patch
@@ -1,7 +1,7 @@
diff -up browser/base/Makefile.in.fu browser/base/Makefile.in
--- browser/base/Makefile.in.fu 2011-07-01 22:40:52.048773336 -0300
+++ browser/base/Makefile.in 2011-07-01 22:42:30.866213879 -0300
-@@ -62,10 +62,9 @@ EXTRA_JS_MODULES = \
+@@ -61,10 +61,9 @@

include $(topsrcdir)/config/rules.mk

diff --git a/http/firefox/install_dir.patch b/http/firefox/install_dir.patch
new file mode 100644
index 0000000..b6f9700
--- /dev/null
+++ b/http/firefox/install_dir.patch
@@ -0,0 +1,28 @@
+diff -Nur mozilla-release.orig/config/autoconf.mk.in
mozilla-release/config/autoconf.mk.in
+--- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048
+0000
++++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469
+0000
+@@ -68,8 +68,8 @@
+ mandir = @mandir@
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST = $(DEPTH)/dist
+ LIBXUL_SDK = @LIBXUL_SDK@
+diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in
mozilla-release/js/src/config/autoconf.mk.in
+--- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06
14:06:45.586263727 +0000
++++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06
14:21:01.770993669 +0000
+@@ -61,8 +61,8 @@
+ datadir = @datadir@
+ mandir = @mandir@
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+
+ TOP_DIST = @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/libs/gmime/DETAILS b/libs/gmime/DETAILS
index 4d0bc8f..fda1050 100755
--- a/libs/gmime/DETAILS
+++ b/libs/gmime/DETAILS
@@ -3,7 +3,7 @@ if [[ "$GMIME_22BRANCH" == "y" ]]; then
VERSION=2.2.26
SOURCE=$SPELL-$VERSION.tar.gz
else
- VERSION=2.4.26
+ VERSION=2.4.28
SOURCE=$SPELL-$VERSION.tar.bz2
SECURITY_PATCH=1
fi
diff --git a/libs/gmime/HISTORY b/libs/gmime/HISTORY
index 6b4e624..97d5d0e 100644
--- a/libs/gmime/HISTORY
+++ b/libs/gmime/HISTORY
@@ -1,3 +1,6 @@
+2011-11-07 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated to 2.4.28
+
2011-08-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.26

diff --git a/libs/gmime/gmime-2.4.26.tar.bz2.sig
b/libs/gmime/gmime-2.4.26.tar.bz2.sig
deleted file mode 100644
index 8d8a41f..0000000
Binary files a/libs/gmime/gmime-2.4.26.tar.bz2.sig and /dev/null differ
diff --git a/libs/gmime/gmime-2.4.28.tar.bz2.sig
b/libs/gmime/gmime-2.4.28.tar.bz2.sig
new file mode 100644
index 0000000..ac50104
Binary files /dev/null and b/libs/gmime/gmime-2.4.28.tar.bz2.sig differ
diff --git a/python-pypi/fabric/DETAILS b/python-pypi/fabric/DETAILS
index 2653861..486ce47 100755
--- a/python-pypi/fabric/DETAILS
+++ b/python-pypi/fabric/DETAILS
@@ -1,9 +1,9 @@
SPELL=fabric
SPELLX=Fabric
- VERSION=1.3.1
+ VERSION=1.3.2
SOURCE=${SPELLX}-${VERSION}.tar.gz

SOURCE_URL[0]=http://pypi.python.org/packages/source/${SPELLX:0:1}/${SPELLX}/${SOURCE}
-
SOURCE_HASH=sha512:e5317f20cec24b8c501e958b7812479c2bdf26411e7cba74f6a4ca5aa6e65e9c92302a8e3c0ff3b9431fb370c4d3e0c8b3676ff82d623537e5ed5c2b44b2c449
+
SOURCE_HASH=sha512:70d9649a5cb429e2befd9203463f13b013fda3fc98dca7d38c160db5e7688fb4aad2fdb22829e44e8900ef6c55bb3b2f47c88f4e607ef745860e67b9c118855d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE=http://fabfile.org/
LICENSE[0]=BSD
diff --git a/python-pypi/fabric/HISTORY b/python-pypi/fabric/HISTORY
index 44257e9..5d60266 100644
--- a/python-pypi/fabric/HISTORY
+++ b/python-pypi/fabric/HISTORY
@@ -1,3 +1,6 @@
+2011-11-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.2
+
2011-10-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.1
* DEPENDS: renewed dependency list
diff --git a/python-pypi/pycrypto/DETAILS b/python-pypi/pycrypto/DETAILS
index 9effe17..7e3ff29 100755
--- a/python-pypi/pycrypto/DETAILS
+++ b/python-pypi/pycrypto/DETAILS
@@ -1,5 +1,5 @@
SPELL=pycrypto
- VERSION=2.4
+ VERSION=2.4.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/pycrypto/HISTORY b/python-pypi/pycrypto/HISTORY
index f087b9c..4d2beb8 100644
--- a/python-pypi/pycrypto/HISTORY
+++ b/python-pypi/pycrypto/HISTORY
@@ -1,3 +1,6 @@
+2011-11-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.1
+
2011-10-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.4
* DEPENDS: now compatible with Python versions from 2.1 through 3.2
diff --git a/python-pypi/python-ssh/DETAILS b/python-pypi/python-ssh/DETAILS
index c5a71c9..b35b6e8 100755
--- a/python-pypi/python-ssh/DETAILS
+++ b/python-pypi/python-ssh/DETAILS
@@ -1,9 +1,9 @@
SPELL=python-ssh
SPELLX=ssh
- VERSION=1.7.8
+ VERSION=1.7.9
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/s/$SPELLX/$SOURCE
-
SOURCE_HASH=sha512:a915a45231766cc8dbe7bae24e711ba3eadc4970e5798ee1641ff283a71dd3d09ab3040886ccca3e2fa1f68bb21a6897bfe7d43dc4ea46c77e6775f67ad1b512
+
SOURCE_HASH=sha512:0f955098a3cd653b50a4dec0b4bb29b821ed5a83a99b76c5b9eaa9e2c522860d3853540801a01abfe9679a678b0411b3ee013d61a43b592dc638a8ddb7b77253
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://pypi.python.org/pypi/ssh/
ENTERED=20111025
diff --git a/python-pypi/python-ssh/HISTORY b/python-pypi/python-ssh/HISTORY
index 6165207..c9b6a4f 100644
--- a/python-pypi/python-ssh/HISTORY
+++ b/python-pypi/python-ssh/HISTORY
@@ -1,2 +1,6 @@
+2011-11-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.7.9
+ * PRE_BUILD: removed
+
2011-10-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, PRE_BUILD: spell created
diff --git a/python-pypi/python-ssh/PRE_BUILD
b/python-pypi/python-ssh/PRE_BUILD
deleted file mode 100755
index 69bb4e1..0000000
--- a/python-pypi/python-ssh/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-sedit "s:, < 2.4::" setup.py
diff --git a/science/viking/DETAILS b/science/viking/DETAILS
index ef043aa..171d61f 100755
--- a/science/viking/DETAILS
+++ b/science/viking/DETAILS
@@ -1,6 +1,6 @@
SPELL=viking
- VERSION=1.2.1
-
SOURCE_HASH=sha512:53c6f55e21e9ebf1ff4720aa547eb01ec7b42335568bd01055dc455f0fd3b4d811eaa48ffab84351703fa3501846dfa408ef18ec67e10889098a6286fa6c26f7
+ VERSION=1.2.2
+
SOURCE_HASH=sha512:50bb2d253cae6f58227c679cafe5747766475962290b14afa6c9604dfe7c358e80275fd0fc5455211331399a91ef4f763ff672277db0d23b9293bff759c19061
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/science/viking/HISTORY b/science/viking/HISTORY
index 79c4c3f..900cd07 100644
--- a/science/viking/HISTORY
+++ b/science/viking/HISTORY
@@ -1,3 +1,7 @@
+2011-11-08 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 1.2.2
+ * PRE_BUILD,curl_types.patch: removed, no longer needed
+
2011-09-15 Bor Kraljič <pyrobor AT ver.si>
* curl_types.patch: fixes build after curl update (upstream patch)
* PRE_BUILD: apply the patch for curl/types.h
diff --git a/science/viking/PRE_BUILD b/science/viking/PRE_BUILD
deleted file mode 100755
index 1273ebd..0000000
--- a/science/viking/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-default_pre_build &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/curl_types.patch
diff --git a/science/viking/curl_types.patch b/science/viking/curl_types.patch
deleted file mode 100644
index 803e12d..0000000
--- a/science/viking/curl_types.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f715a77fbdc11aafff35f066380b34a99401a698 Mon Sep 17 00:00:00 2001
-From: Hanno Boeck <ctulhu AT users.sourceforge.net>
-Date: Mon, 25 Jul 2011 19:39:59 +0100
-Subject: [PATCH] Fix compilation with curl 7.21.7 (SF#3376584)
-
-Remove include of curl/types.h, which has been deprecated for a long time.
----
- src/osm-traces.c | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/src/osm-traces.c b/src/osm-traces.c
-index 6ef5bb5..f5088ce 100644
---- a/src/osm-traces.c
-+++ b/src/osm-traces.c
-@@ -27,7 +27,6 @@
- #include <errno.h>
-
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
-
- #include <glib.h>
---
-1.7.4.1



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (b7666b75c008d236f732a9f7a5d1f9b80f28e2c5), Vlad Glagolev, 11/08/2011

Archive powered by MHonArc 2.6.24.

Top of Page