Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b31e8e780e09868a02dba57c4397c847577309e5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (b31e8e780e09868a02dba57c4397c847577309e5)
  • Date: Fri, 21 Jun 2019 20:30:52 +0000

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

gnome2-libs/gtk-doc/DETAILS | 5
gnome2-libs/gtk-doc/HISTORY | 3
gnome2-libs/gtk-doc/x | 7 -
graphics/argyllcms/0001-fix-compilation-with-gcc-7.patch | 98
---------------
graphics/argyllcms/DETAILS | 4
graphics/argyllcms/HISTORY | 5
graphics/argyllcms/PRE_BUILD | 5
graphics/argyllcms/argyllcms-1.8.0-gcc5.patch | 20 ---
python-pypi/pygments/DETAILS | 8 -
python-pypi/pygments/HISTORY | 3
x11/colord/DEPENDS | 11 +
x11/colord/DETAILS | 2
x11/colord/HISTORY | 5
x11/colord/PRE_BUILD | 6
14 files changed, 39 insertions(+), 143 deletions(-)

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

x11/colord: version 1.4.4

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

python-pypi/pygments: version 2.4.2

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

gnome2-libs/gtk-doc: version 1.30

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

graphics/argyllcms: version 2.1.1

diff --git a/gnome2-libs/gtk-doc/DETAILS b/gnome2-libs/gtk-doc/DETAILS
index 34c4c09..2e4b786 100755
--- a/gnome2-libs/gtk-doc/DETAILS
+++ b/gnome2-libs/gtk-doc/DETAILS
@@ -1,12 +1,11 @@
SPELL=gtk-doc
- VERSION=1.25
-
SOURCE_HASH=sha512:7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
+ VERSION=1.30
+
SOURCE_HASH=sha256:a4f6448eb838ccd30d76a33b1fd095f81aea361f03b12c7b23df181d21b7069e:UPSTREAM_HASH
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
LICENSE[0]=GPL
- PATCHLEVEL=0
WEB_SITE=http://www.gtk.org/gtk-doc/
ENTERED=20020509
KEYWORDS="gnome2 libs"
diff --git a/gnome2-libs/gtk-doc/HISTORY b/gnome2-libs/gtk-doc/HISTORY
index a51dbbe..3a8df43 100644
--- a/gnome2-libs/gtk-doc/HISTORY
+++ b/gnome2-libs/gtk-doc/HISTORY
@@ -1,3 +1,6 @@
+2019-06-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.30
+
2016-05-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.25
* DEPENDS: delete rarian
diff --git a/gnome2-libs/gtk-doc/x b/gnome2-libs/gtk-doc/x
deleted file mode 100644
index b162e8c..0000000
--- a/gnome2-libs/gtk-doc/x
+++ /dev/null
@@ -1,7 +0,0 @@
-total 24
-drwxr-xr-x 3 root root 4096 May 3 14:54 xml-dtd-4.1.2
-drwxr-xr-x 3 root root 4096 May 3 14:54 xml-dtd-4.2
-drwxr-xr-x 3 root root 4096 May 3 14:54 xml-dtd-4.3
-drwxr-xr-x 3 root root 4096 May 3 14:54 xml-dtd-4.4
-drwxr-xr-x 3 root root 4096 May 3 14:54 xml-dtd-4.5
-drwxr-xr-x 32 root root 4096 Apr 14 17:58 xsl-stylesheets-1.79
diff --git a/graphics/argyllcms/0001-fix-compilation-with-gcc-7.patch
b/graphics/argyllcms/0001-fix-compilation-with-gcc-7.patch
deleted file mode 100644
index 62efd73..0000000
--- a/graphics/argyllcms/0001-fix-compilation-with-gcc-7.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From d0809ded29bf1dc22620b60a905e851cb4a9e0bd Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Mon, 5 Jun 2017 15:47:55 +0200
-Subject: [PATCH] fix compilation with gcc 7
-
----
- numlib/numsup.c | 28 +++++++++++++++-------------
- xml/mxml-attr.c | 2 ++
- xml/mxml-node.c | 1 +
- xml/mxml-private.c | 1 +
- 4 files changed, 19 insertions(+), 13 deletions(-)
-
-diff --git a/numlib/numsup.c b/numlib/numsup.c
-index 39011ae..1bffedb 100755
---- a/numlib/numsup.c
-+++ b/numlib/numsup.c
-@@ -44,6 +44,21 @@
- * can get a callback on out of memory etc. ???
- *
- */
-+#ifdef UNIX
-+# define A1LOG_LOCK(log, deb)
\
-+ if (g_log_init == 0) {
\
-+ pthread_mutex_init(&log->lock, NULL);
\
-+ pthread_mutex_lock(&log->lock);
\
-+ g_log_init = 1;
\
-+ } else {
\
-+ pthread_mutex_lock(&log->lock);
\
-+ }
\
-+ if (deb && !g_deb_init) {
\
-+ va_loge(log, "Argyll 'V%s' Build '%s' System
'%s'\n",ARGYLL_VERSION_STR,ARGYLL_BUILD_STR, get_sys_info()); \
-+ g_deb_init = 1;
\
-+ }
-+# define A1LOG_UNLOCK(log) pthread_mutex_unlock(&log->lock)
-+#endif
-
- /* Globals */
-
-@@ -356,19 +371,6 @@ static char *get_sys_info() {
- return sysinfo;
- }
-
--# define A1LOG_LOCK(log, deb)
\
-- if (g_log_init == 0) {
\
-- pthread_mutex_init(&log->lock, NULL);
\
-- pthread_mutex_lock(&log->lock);
\
-- g_log_init = 1;
\
-- } else {
\
-- pthread_mutex_lock(&log->lock);
\
-- }
\
-- if (deb && !g_deb_init) {
\
-- va_loge(log, "Argyll 'V%s' Build '%s' System
'%s'\n",ARGYLL_VERSION_STR,ARGYLL_BUILD_STR, get_sys_info()); \
-- g_deb_init = 1;
\
-- }
--# define A1LOG_UNLOCK(log) pthread_mutex_unlock(&log->lock)
- #endif
-
-
-diff --git a/xml/mxml-attr.c b/xml/mxml-attr.c
-index 53f8076..ed755ea 100755
---- a/xml/mxml-attr.c
-+++ b/xml/mxml-attr.c
-@@ -29,6 +29,8 @@
- #include "mxml-config.h"
- #include "mxml.h"
-
-+#include <stdarg.h>
-+
-
- /*
- * Local functions...
-diff --git a/xml/mxml-node.c b/xml/mxml-node.c
-index bebda10..be76335 100755
---- a/xml/mxml-node.c
-+++ b/xml/mxml-node.c
-@@ -40,6 +40,7 @@
- #include "mxml-config.h"
- #include "mxml.h"
-
-+#include <stdarg.h>
-
- /*
- * Local functions...
-diff --git a/xml/mxml-private.c b/xml/mxml-private.c
-index 72f3e23..4d77156 100755
---- a/xml/mxml-private.c
-+++ b/xml/mxml-private.c
-@@ -28,6 +28,7 @@
-
- #include "mxml-private.h"
-
-+#include <stdarg.h>
-
- /*
- * Some crazy people think that unloading a shared object is a good or safe
---
-2.12.0
-
diff --git a/graphics/argyllcms/DETAILS b/graphics/argyllcms/DETAILS
index 5e58274..2b7174d 100755
--- a/graphics/argyllcms/DETAILS
+++ b/graphics/argyllcms/DETAILS
@@ -1,8 +1,8 @@
SPELL=argyllcms
- VERSION=1.9.2
+ VERSION=2.1.1
SOURCE="Argyll_V${VERSION}_src.zip"
SOURCE_URL[0]=http://www.${SPELL}.com/${SOURCE}
-
SOURCE_HASH=sha512:f21fc2385b643dd6c32d1b1b0ab208a79ad8bc4319ac644d96e69ebc4c4e333d38b41e4516742816da9a91145e4f00bffb7f8b61a827859d5e14c1a8867b5a41
+
SOURCE_HASH=sha512:551b90c245d15e401c96c76ec0be66053bd75ca4d8b668a41841d72197820ed27d4d0186f903c126f7bacd667170e8e45e42ad31fcd44ec3276558b87b520565
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Argyll_V${VERSION}"
WEB_SITE="http://www.argyllcms.com/";
LICENSE[0]=GPL
diff --git a/graphics/argyllcms/HISTORY b/graphics/argyllcms/HISTORY
index f9c7797..0a64b6e 100644
--- a/graphics/argyllcms/HISTORY
+++ b/graphics/argyllcms/HISTORY
@@ -1,3 +1,8 @@
+2019-06-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.1.1
+ * PRE_BUILD, 0001-fix-compilation-with-gcc-7.patch,
+ argyllcms-1.8.0-gcc5.patch: remove obsolete patches
+
2017-06-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.9.2
* 0001-fix-compilation-with-gcc-7.patch, PRE_BUILD: fix compilation
with gcc 7
diff --git a/graphics/argyllcms/PRE_BUILD b/graphics/argyllcms/PRE_BUILD
index 95cf7d1..92676b2 100755
--- a/graphics/argyllcms/PRE_BUILD
+++ b/graphics/argyllcms/PRE_BUILD
@@ -1,11 +1,6 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

-patch -p1 < "$SPELL_DIRECTORY/argyllcms-1.8.0-gcc5.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/0001-fix-compilation-with-gcc-7.patch" &&
-
-
-
echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop &&
echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau
-lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop &&
sed \
diff --git a/graphics/argyllcms/argyllcms-1.8.0-gcc5.patch
b/graphics/argyllcms/argyllcms-1.8.0-gcc5.patch
deleted file mode 100644
index 2806745..0000000
--- a/graphics/argyllcms/argyllcms-1.8.0-gcc5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix FTBFS with GCC 5
-Author: James Cowgill <james410 AT cowgill.org.uk>
-Bug-Debian: https://bugs.debian.org/777779
-Forwarded: no
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/icc/icc.h
-+++ b/icc/icc.h
-@@ -100,7 +100,11 @@
- #define CF64PREC "LL" /* Constant precision specifier */
-
- #ifndef ATTRIBUTE_NORETURN
-+#ifdef _MSC_VER
- # define ATTRIBUTE_NORETURN __declspec(noreturn)
-+#else
-+# define ATTRIBUTE_NORETURN __attribute__((noreturn))
-+#endif
- #endif
-
- #else /* !__STDC_VERSION__ */
diff --git a/python-pypi/pygments/DETAILS b/python-pypi/pygments/DETAILS
index 78b1805..81c837c 100755
--- a/python-pypi/pygments/DETAILS
+++ b/python-pypi/pygments/DETAILS
@@ -1,13 +1,9 @@
SPELL=pygments
SPELLX=Pygments
- VERSION=2.1.3
-
SOURCE_HASH=sha512:b58e2cc535ba3f1fda7cb147e12af128bc2755de56cf465f8f1d642730eaef50c06551cc4cc44f25f726b00f3f1c9c2078977233b11c0b6a7e1add6a4069c27e
+ VERSION=2.4.2
+
SOURCE_HASH=sha512:c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66
SOURCE=${SPELLX}-${VERSION}.tar.gz
- SOURCE2=${SOURCE}.asc
SOURCE_URL[0]=https://pypi.io/packages/source/P/${SPELLX}/${SOURCE}
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=pygments.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
DOC_DIRS=""
WEB_SITE=http://pygments.org/
diff --git a/python-pypi/pygments/HISTORY b/python-pypi/pygments/HISTORY
index 479ab9f..cf3cc2a 100644
--- a/python-pypi/pygments/HISTORY
+++ b/python-pypi/pygments/HISTORY
@@ -1,3 +1,6 @@
+2019-06-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.4.2, use SOURCE_HASH instead of gpg checking
+
2016-08-31 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.1.3; use SPELLX; updated source url;
converted to upstream gpg check
diff --git a/x11/colord/DEPENDS b/x11/colord/DEPENDS
index 96ce8c3..20b522c 100755
--- a/x11/colord/DEPENDS
+++ b/x11/colord/DEPENDS
@@ -1,5 +1,4 @@
depends dbus &&
-depends docbook-utils &&
depends glib2 &&
depends intltool &&
depends lcms2 &&
@@ -9,6 +8,16 @@ depends meson &&
depends policykit &&
depends sqlite &&

+optional_depends gtk-doc \
+ 'docs=true' \
+ 'docs=false' \
+ 'install documentation' &&
+
+optional_depends docbook-utils \
+ 'man=true' \
+ 'man=false' \
+ 'install manpages' &&
+
optional_depends bash \
'bash_completion=true' \
'bash_completion=false' \
diff --git a/x11/colord/DETAILS b/x11/colord/DETAILS
index b88f28c..92fe13d 100755
--- a/x11/colord/DETAILS
+++ b/x11/colord/DETAILS
@@ -1,6 +1,6 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=colord
- VERSION=1.4.3
+ VERSION=1.4.4
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/x11/colord/HISTORY b/x11/colord/HISTORY
index adcc718..c228a70 100644
--- a/x11/colord/HISTORY
+++ b/x11/colord/HISTORY
@@ -1,3 +1,8 @@
+2019-06-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.4.4
+ * DEPENDS: add optional dependencies on gtk-doc and docbook-utils
+ * PRE_BUILD: use local version of docbook.xsl
+
2018-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, INSTALL: fix dependencies and installation
* INSTALL: removed
diff --git a/x11/colord/PRE_BUILD b/x11/colord/PRE_BUILD
new file mode 100755
index 0000000..441e7e6
--- /dev/null
+++ b/x11/colord/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+STYLESHEET=$(ls
/usr/share/xml/docbook/xsl-stylesheets-*/manpages/docbook.xsl) &&
+message "$STYLESHEET"
+sedit
"s|http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl|$STYLESHEET|"
man/meson.build



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b31e8e780e09868a02dba57c4397c847577309e5), Florian Franzmann, 06/21/2019

Archive powered by MHonArc 2.6.24.

Top of Page