Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e582125b26a1aee95744ec1e92c48f1a99f2d420)

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 master grimoire by Vlad Glagolev (e582125b26a1aee95744ec1e92c48f1a99f2d420)
  • Date: Wed, 14 Sep 2011 14:19:00 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ftp/curl/DETAILS | 3 +--
ftp/curl/HISTORY | 3 +++
video/xine-ui/HISTORY | 4 ++++
video/xine-ui/PRE_BUILD | 2 ++
video/xine-ui/curl.patch | 10 ++++++++++
x11/conky/DETAILS | 2 +-
x11/conky/HISTORY | 5 +++++
x11/conky/PRE_BUILD | 4 ++++
x11/conky/curl.patch | 20 ++++++++++++++++++++
9 files changed, 50 insertions(+), 3 deletions(-)

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

xine-ui: fix compilation with curl >=7.21.7

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

conky: fix compilation with curl >=7.21.7

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

curl: => 7.22.0

diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index e6c0e5a..9b5fc52 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,5 +1,5 @@
SPELL=curl
- VERSION=7.21.7
+ VERSION=7.22.0
SECURITY_PATCH=8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
@@ -10,7 +10,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[0]=$SOURCE_URL.asc
SOURCE_GPG=curl.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- PATCHLEVEL=0
WEB_SITE=http://curl.haxx.se/
ENTERED=20010922
LICENSE[0]=MIT
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 4ef9e19..b74b860 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 7.22.0
+
2011-06-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.21.7, SECURITY_PATCH=8
http://curl.haxx.se/docs/adv_20110623.html
diff --git a/video/xine-ui/HISTORY b/video/xine-ui/HISTORY
index 5e48d25..f9ce18d 100644
--- a/video/xine-ui/HISTORY
+++ b/video/xine-ui/HISTORY
@@ -1,3 +1,7 @@
+2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply the patch
+ * curl.patch: added, to fix compilation with curl >=7.21.7
+
2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
* xine.desktop: added generic name

diff --git a/video/xine-ui/PRE_BUILD b/video/xine-ui/PRE_BUILD
index 33a35e7..4d61fa0 100755
--- a/video/xine-ui/PRE_BUILD
+++ b/video/xine-ui/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p0 < "$SPELL_DIRECTORY/curl.patch" &&
+
sed -i "s: install-data-hook::" misc/Makefile.in
diff --git a/video/xine-ui/curl.patch b/video/xine-ui/curl.patch
new file mode 100644
index 0000000..57a7f57
--- /dev/null
+++ b/video/xine-ui/curl.patch
@@ -0,0 +1,10 @@
+--- src/xitk/download.c.orig 2009-12-19 03:34:22.000000000 +0300
++++ src/xitk/download.c 2011-09-14 23:13:28.299536494 +0400
+@@ -28,7 +28,6 @@
+
+ #ifdef HAVE_CURL
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+
diff --git a/x11/conky/DETAILS b/x11/conky/DETAILS
index 2212da6..9277d54 100755
--- a/x11/conky/DETAILS
+++ b/x11/conky/DETAILS
@@ -1,6 +1,6 @@
SPELL=conky
VERSION=1.8.1
- PATCH_LEVEL=1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index 6148758..409bedb 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,8 @@
+2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: corrected PATCHLEVEL
+ * PRE_BUILD: added, to apply the patch
+ * curl.patch: added, to fix compilation with curl >=7.21.7
+
2011-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* CONFIGURE, BUILD: added optional support for METAR and XOAP weather,
IBM/Lenovo laptops, Eve-Online skill monitor and RSS
diff --git a/x11/conky/PRE_BUILD b/x11/conky/PRE_BUILD
new file mode 100755
index 0000000..2486ec5
--- /dev/null
+++ b/x11/conky/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/curl.patch"
diff --git a/x11/conky/curl.patch b/x11/conky/curl.patch
new file mode 100644
index 0000000..d6c7e74
--- /dev/null
+++ b/x11/conky/curl.patch
@@ -0,0 +1,20 @@
+--- src/ccurl_thread.c.orig 2010-10-06 01:29:36.000000000 +0400
++++ src/ccurl_thread.c 2011-09-14 23:09:00.762899542 +0400
+@@ -33,7 +33,6 @@
+ #endif /* DEBUG */
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ /*
+--- src/eve.c.orig 2010-10-06 01:29:36.000000000 +0400
++++ src/eve.c 2011-09-14 23:09:15.386715713 +0400
+@@ -37,7 +37,6 @@
+ #include <libxml/xmlwriter.h>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include <time.h>



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e582125b26a1aee95744ec1e92c48f1a99f2d420), Vlad Glagolev, 09/14/2011

Archive powered by MHonArc 2.6.24.

Top of Page