sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (c590f058a4172149a730ef01f039bbdcabab5368)

From: Florian Franzmann <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c590f058a4172149a730ef01f039bbdcabab5368)
Date: Mon, 1 Apr 2013 07:11:30 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 3 +++
python-pypi/calibre/DEPENDS | 1 +
python-pypi/calibre/DETAILS | 2 +-
python-pypi/calibre/HISTORY | 6 ++++++
python-pypi/calibre/PRE_BUILD | 2 +-
python-pypi/calibre/calibre-stop-phone-home.diff | 22
----------------------
x11-toolkits/qt4-private-headers/BUILD | 1 +
x11-toolkits/qt4-private-headers/DEPENDS | 1 +
x11-toolkits/qt4-private-headers/DETAILS | 19 +++++++++++++++++++
x11-toolkits/qt4-private-headers/HISTORY | 5 +++++
x11-toolkits/qt4-private-headers/INSTALL | 12 ++++++++++++
11 files changed, 50 insertions(+), 24 deletions(-)

New commits:
commit c590f058a4172149a730ef01f039bbdcabab5368
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/calibre: add SOURCE_HASH

commit 1fe0c4e1ab9bb483349602ccf01656797f04aa8a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/calibre: remove obsolete patch

commit 26bbdef230219b5a5571a3054a9a5175001003f2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/calibre: add dependency on qt4-private-headers

commit 3cb010e73c0ad08f9e2bbbf0ca20051cbc4f7a01
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-toolkits/qt4-private-headers: new spell, private headers for qt4

diff --git a/ChangeLog b/ChangeLog
index bfb724b..688f633 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-04-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * x11-toolkits/qt4-private-headers: new spell, private headers for qt4
+
2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* python-pypi/clientform: spell deprecated [part of mechanize now]
* python-pypi/python-netifaces: new spell, portable network interface
diff --git a/python-pypi/calibre/DEPENDS b/python-pypi/calibre/DEPENDS
index abcb8c1..e753938 100755
--- a/python-pypi/calibre/DEPENDS
+++ b/python-pypi/calibre/DEPENDS
@@ -3,6 +3,7 @@ depends SETUPTOOLS &&
depends pil &&
depends LIBUSB &&
depends qt4 &&
+depends qt4-private-headers &&
depends pyqt4 &&
depends mechanize &&
depends imagemagick &&
diff --git a/python-pypi/calibre/DETAILS b/python-pypi/calibre/DETAILS
index 68aee39..1647006 100755
--- a/python-pypi/calibre/DETAILS
+++ b/python-pypi/calibre/DETAILS
@@ -2,7 +2,7 @@
VERSION=0.9.25
SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]="$SOURCEFORGE_URL/$SPELL/$VERSION/$SOURCE"
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:27a62ba48d6e0bde868c4ae0f10cd5abf5432c2cb4d3076183cd35c6662340b47cb6143924675b3eadb54fb4641594cc59e1c291ef45decdb7e814dd13f8ec1c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
WEB_SITE="http://calibre-ebook.com/";
LICENSE[0]=GPL
diff --git a/python-pypi/calibre/HISTORY b/python-pypi/calibre/HISTORY
index f9e2f3e..16b5180 100644
--- a/python-pypi/calibre/HISTORY
+++ b/python-pypi/calibre/HISTORY
@@ -1,3 +1,9 @@
+2013-04-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependency on qt4-private-headers
+ * PRE_BUILD, calibre-stop-phone-home.diff: removed obsolete
+ patch, sed in PRE_BUILD instead
+ * DETAILS: add SOURCE_HASH
+
2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.9.25
* DEPENDS: added dependencies on python-netifaces, psutil,
python-cssselect
diff --git a/python-pypi/calibre/PRE_BUILD b/python-pypi/calibre/PRE_BUILD
index c2617f0..6c30990 100755
--- a/python-pypi/calibre/PRE_BUILD
+++ b/python-pypi/calibre/PRE_BUILD
@@ -5,5 +5,5 @@ xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
cd $SOURCE_DIRECTORY &&

if [ "$CALIBRE_PHOME" = "y" ]; then
- patch -p1 < $SCRIPT_DIRECTORY/calibre-stop-phone-home.diff
+ sed -i -e
's/$--no-update-check.*$False$.*$store_true/\1True\2store_false/g'
src/calibre/gui2/main.py
fi
diff --git a/python-pypi/calibre/calibre-stop-phone-home.diff
b/python-pypi/calibre/calibre-stop-phone-home.diff
deleted file mode 100644
index 6c3f09d..0000000
--- a/python-pypi/calibre/calibre-stop-phone-home.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur calibre.orig/src/calibre/gui2/update.py
calibre/src/calibre/gui2/update.py
---- calibre.orig/src/calibre/gui2/update.py 2012-09-20 16:27:22.398340171
-0500
-+++ calibre/src/calibre/gui2/update.py 2012-09-20 16:27:58.594339911 -0500
-@@ -20,18 +20,6 @@
- VSEP = '|'
-
- def get_newest_version():
-- br = browser()
-- req = mechanize.Request(URL)
-- req.add_header('CALIBRE_VERSION', __version__)
-- req.add_header('CALIBRE_OS',
-- 'win' if iswindows else 'osx' if isosx else 'oth')
-- req.add_header('CALIBRE_INSTALL_UUID', prefs['installation_uuid'])
-- version = br.open(req).read().strip()
-- try:
-- version = version.decode('utf-8')
-- except UnicodeDecodeError:
-- version = u''
-- return version
-
- class CheckForUpdates(QThread):
-
diff --git a/x11-toolkits/qt4-private-headers/BUILD
b/x11-toolkits/qt4-private-headers/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/x11-toolkits/qt4-private-headers/BUILD
@@ -0,0 +1 @@
+true
diff --git a/x11-toolkits/qt4-private-headers/DEPENDS
b/x11-toolkits/qt4-private-headers/DEPENDS
new file mode 100755
index 0000000..428f269
--- /dev/null
+++ b/x11-toolkits/qt4-private-headers/DEPENDS
@@ -0,0 +1 @@
+depends qt4
diff --git a/x11-toolkits/qt4-private-headers/DETAILS
b/x11-toolkits/qt4-private-headers/DETAILS
new file mode 100755
index 0000000..051f747
--- /dev/null
+++ b/x11-toolkits/qt4-private-headers/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=qt4-private-headers
+ SPELLX=qt-everywhere-opensource-src
+ VERSION=4.8.4
+
SOURCE_HASH=sha512:472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ GATHER_DOCS=no
+ SOURCE_URL[0]=http://releases.qt-project.org/qt4/source/$SOURCE
+ WEB_SITE=http://www.qtsoftware.com/products
+ ENTERED=20130330
+ LICENSE[0]=LGPL
+ SHORT="Private headers for QT4 ver 4.8.4"
+cat << EOF
+Some applications, such as calibre, require the QT4
+private headers API, and they are missing when casting
+QT4. To avoid rcompiling QT4, with such option on
+(which by now doesn't exist on SMGL), the fastest is
+to provide the headers in a separate spell.
+EOF
diff --git a/x11-toolkits/qt4-private-headers/HISTORY
b/x11-toolkits/qt4-private-headers/HISTORY
new file mode 100644
index 0000000..081af49
--- /dev/null
+++ b/x11-toolkits/qt4-private-headers/HISTORY
@@ -0,0 +1,5 @@
+2013-03-30 Javier Vasquez <j.e.vasquez.v AT gmail.com>
+ * DETAILS, BUILD, INSTALL: New spell based on qt4, but
+ following what arch does for qt4-private-headers.
+ See:
+
https://projects.archlinux.org/svntogit/community.git/plain/trunk/PKGBUILD?h=packages/qt4-private-headers
diff --git a/x11-toolkits/qt4-private-headers/INSTALL
b/x11-toolkits/qt4-private-headers/INSTALL
new file mode 100755
index 0000000..eb82179
--- /dev/null
+++ b/x11-toolkits/qt4-private-headers/INSTALL
@@ -0,0 +1,12 @@
+install -d ${INSTALL_ROOT}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
&&
+install -d
${INSTALL_ROOT}/usr/include/qt4/private-src/{corelib,declarative,gui,script}
&&
+
+for i in QtCore QtDeclarative QtGui QtScript; do
+ cp -r ${SOURCE_DIRECTORY}/include/${i}/private
${INSTALL_ROOT}/usr/include/${i}
+done
&&
+
+find ${INSTALL_ROOT}/usr/include/Qt*/private/ -name *.h -exec sed -i
's|#include "../../../src/|#include "../../qt4/private-src/|' {} \; &&
+
+for i in corelib declarative gui script; do
+ cp -r ${SOURCE_DIRECTORY}/src/${i}
${INSTALL_ROOT}/usr/include/qt4/private-src
+done

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (c590f058a4172149a730ef01f039bbdcabab5368), Florian Franzmann, 04/01/2013