Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (32c574b9eb08f7389d87c62c5ebddae69374bc56)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (32c574b9eb08f7389d87c62c5ebddae69374bc56)
  • Date: Sat, 4 May 2013 06:18:00 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics/djview4/DETAILS | 6 ++--
graphics/djview4/HISTORY | 4 ++
graphics/djview4/PRE_BUILD | 4 --
graphics/djview4/qt4.8.patch | 58
-------------------------------------------
4 files changed, 7 insertions(+), 65 deletions(-)

New commits:
commit 32c574b9eb08f7389d87c62c5ebddae69374bc56
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

djview4: => 4.9

diff --git a/graphics/djview4/DETAILS b/graphics/djview4/DETAILS
index 6a46c82..1c4a654 100755
--- a/graphics/djview4/DETAILS
+++ b/graphics/djview4/DETAILS
@@ -1,9 +1,9 @@
SPELL=djview4
SPELLX=djview
- VERSION=4.8
-
SOURCE_HASH=sha512:21bdf30bd4b63f95fe0bb25650c08defc43bdd3041122c7c78a93268942d0e2e92822a78a8e101e35f50c363a3b3ce5dd31d6ff1c19c163833d086bd8422402c
+ VERSION=4.9
+
SOURCE_HASH=sha512:dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94
SOURCE=$SPELLX-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/djvu/$SOURCE
WEB_SITE=http://djvu.SourceForge.net
LICENSE[0]=GPL
diff --git a/graphics/djview4/HISTORY b/graphics/djview4/HISTORY
index 67db134..a60caa0 100644
--- a/graphics/djview4/HISTORY
+++ b/graphics/djview4/HISTORY
@@ -1,3 +1,7 @@
+2013-05-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.9
+ * PRE_BUILD, qt4.8.patch: deleted
+
2012-04-04 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 4.8
* BUILD: switched to default_build with minor corrections for
diff --git a/graphics/djview4/PRE_BUILD b/graphics/djview4/PRE_BUILD
deleted file mode 100755
index dd463cb..0000000
--- a/graphics/djview4/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 118238c..0000000
--- a/graphics/djview4/qt4.8.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
-



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (32c574b9eb08f7389d87c62c5ebddae69374bc56), Treeve Jelbert, 05/04/2013

Archive powered by MHonArc 2.6.24.

Top of Page