Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (1b21a8e519c8ec32763c60a0712f36a1966db35a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (1b21a8e519c8ec32763c60a0712f36a1966db35a)
  • Date: Wed, 4 Apr 2012 00:09:24 -0500

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

graphics/djview4/BUILD | 5 +--
graphics/djview4/DETAILS | 4 +-
graphics/djview4/HISTORY | 6 ++++
graphics/djview4/PRE_BUILD | 4 ++
graphics/djview4/qt4.8.patch | 58
+++++++++++++++++++++++++++++++++++++++++++
graphics/djvulibre/DETAILS | 6 ++--
graphics/djvulibre/HISTORY | 4 ++
graphics/djvulibre/PRE_BUILD | 6 ----
8 files changed, 79 insertions(+), 14 deletions(-)

New commits:
commit 1b21a8e519c8ec32763c60a0712f36a1966db35a
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

graphics/djview4: updated to 4.8, added patch to build with Qt 4.8

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

graphics/djvulibre: updated to 3.5.25.2

diff --git a/graphics/djview4/BUILD b/graphics/djview4/BUILD
index 00e75ab..b20c061 100755
--- a/graphics/djview4/BUILD
+++ b/graphics/djview4/BUILD
@@ -1,4 +1,3 @@
-export QTDIR="" &&
-export PATH=${INSTALL_ROOT}/usr/bin/qt4:$PATH &&
+export QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
+export PATH="$QTDIR/bin/qt4:$PATH" &&
default_build
-
diff --git a/graphics/djview4/DETAILS b/graphics/djview4/DETAILS
index ebe5d98..6a46c82 100755
--- a/graphics/djview4/DETAILS
+++ b/graphics/djview4/DETAILS
@@ -1,7 +1,7 @@
SPELL=djview4
SPELLX=djview
- VERSION=4.7
-
SOURCE_HASH=sha512:312abbe02dcef49e8deb7251a333efdfbcbdbd7aab31e2a0037cbd20acab148bb05a31b9fb1020fb825cafe6b6ca9509740970ff1bc2ea7931c98ae5070f24ec
+ VERSION=4.8
+
SOURCE_HASH=sha512:21bdf30bd4b63f95fe0bb25650c08defc43bdd3041122c7c78a93268942d0e2e92822a78a8e101e35f50c363a3b3ce5dd31d6ff1c19c163833d086bd8422402c
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/djvu/$SOURCE
diff --git a/graphics/djview4/HISTORY b/graphics/djview4/HISTORY
index bf63a9c..67db134 100644
--- a/graphics/djview4/HISTORY
+++ b/graphics/djview4/HISTORY
@@ -1,3 +1,9 @@
+2012-04-04 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated to 4.8
+ * BUILD: switched to default_build with minor corrections for
+ ./configure
+ * PRE_BUILD, qt4.8.patch: added patch to build with Qt 4.8
+
2011-04-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.7

diff --git a/graphics/djview4/PRE_BUILD b/graphics/djview4/PRE_BUILD
new file mode 100755
index 0000000..dd463cb
--- /dev/null
+++ b/graphics/djview4/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/qt4.8.patch"
diff --git a/graphics/djview4/qt4.8.patch b/graphics/djview4/qt4.8.patch
new file mode 100644
index 0000000..118238c
--- /dev/null
+++ b/graphics/djview4/qt4.8.patch
@@ -0,0 +1,58 @@
+From 7d4802964b9e74506c63f43505b632f6e7b5db3c Mon Sep 17 00:00:00 2001
+From: Leon Bottou <leon AT bottou.org>
+Date: Mon, 2 Apr 2012 07:11:36 -0700
+Subject: [PATCH 1/1] removed swap (use qSwap instead).
+
+Fixes Gentoo bug 401517, compilation problems with qt-4.8.
+Unclear why is namespace std in scope at this point when using qt-4.8...
+---
+ src/qdjvuwidget.cpp | 17 ++++-------------
+ 1 files changed, 4 insertions(+), 13 deletions(-)
+
+diff --git a/src/qdjvuwidget.cpp b/src/qdjvuwidget.cpp
+index 52ac366..8136d07 100644
+--- a/src/qdjvuwidget.cpp
++++ b/src/qdjvuwidget.cpp
+@@ -152,15 +152,6 @@ all_numbers(const char *s)
+ return true;
+ }
+
+-template<class T> static inline void
+-swap(T& x, T& y)
+-{
+- T tmp;
+- tmp = x;
+- x = y;
+- y = tmp;
+-}
+-
+ template<class T> static inline int
+ ksmallest(T *v, int n, int k)
+ {
+@@ -173,11 +164,11 @@ ksmallest(T *v, int n, int k)
+ /* Sort v[lo], v[m], v[hi] by insertion */
+ m = (lo+hi)/2;
+ if (v[lo]>v[m])
+- swap(v[lo],v[m]);
++ qSwap(v[lo],v[m]);
+ if (v[m]>v[hi]) {
+- swap(v[m],v[hi]);
++ qSwap(v[m],v[hi]);
+ if (v[lo]>v[m])
+- swap(v[lo],v[m]);
++ qSwap(v[lo],v[m]);
+ }
+ /* Extract pivot, place sentinel */
+ pivot = v[m];
+@@ -191,7 +182,7 @@ ksmallest(T *v, int n, int k)
+ do ++l; while (v[l]<pivot);
+ do --h; while (v[h]>pivot);
+ if (l < h) {
+- swap(v[l],v[h]);
++ qSwap(v[l],v[h]);
+ goto loop;
+ }
+ /* Finish up */
+--
+1.7.4.1
+
diff --git a/graphics/djvulibre/DETAILS b/graphics/djvulibre/DETAILS
index 3131630..4724495 100755
--- a/graphics/djvulibre/DETAILS
+++ b/graphics/djvulibre/DETAILS
@@ -1,8 +1,8 @@
SPELL=djvulibre
- VERSION=3.5.24
-
SOURCE_HASH=sha512:7a81373eb5d3cda657afdf16ad0b39d85446993a9d60668d1c9927cb9db1ebab5fed0d6b2c6f946d8c7c4e1c96cf6f6c96ba3ef083ada0e82b17f3a5ccabb579
+ VERSION=3.5.25.2
+
SOURCE_HASH=sha512:824d0d3d193495351cdc18f78cbf45a2d94d0884ff8be2b6a23f9dfa8d6bce8948507cb43633af940ad43b1f8e7520a2500075ef664d67e51a3b2a29b91ae110
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-?}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION:0:6}
SOURCE_URL[0]=$SOURCEFORGE_URL/djvu/$SOURCE
WEB_SITE=http://djvu.sourceforge.net/
ENTERED=20030125
diff --git a/graphics/djvulibre/HISTORY b/graphics/djvulibre/HISTORY
index 493eb1b..6248817 100644
--- a/graphics/djvulibre/HISTORY
+++ b/graphics/djvulibre/HISTORY
@@ -1,3 +1,7 @@
+2012-04-04 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 3.5.25.2, fixed SOURCE_DIRECTORY
+ * PRE_BUILD: removed, builds fine with gcc 4.7
+
2011-10-10 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: removed optional dependency on qt-x11

diff --git a/graphics/djvulibre/PRE_BUILD b/graphics/djvulibre/PRE_BUILD
deleted file mode 100755
index dced7a9..0000000
--- a/graphics/djvulibre/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# fix for gcc-4.6.0
-sed -i '/"atomic/ i\
-#include <cstddef>
-' libdjvu/GSmartPointer.h



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (1b21a8e519c8ec32763c60a0712f36a1966db35a), Pol Vinogradov, 04/04/2012

Archive powered by MHonArc 2.6.24.

Top of Page