Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

Chronological Thread  
    < 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 (8bbb1600b9a6c037647617f9e05b52cb85c7d13a)
  • Date: Thu, 11 Apr 2013 13:05:05 -0500
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 4 ++++
devel/git/DETAILS | 8 ++++----
devel/git/HISTORY | 3 +++
graphics/imagemagick/DETAILS | 4 ++--
graphics/imagemagick/HISTORY | 3 +++
x11/nxcomp/0001-respect-CXXFLAGS.patch | 26 ++++++++++++++++++++++++++
x11/nxcomp/DEPENDS | 3 ++-
x11/nxcomp/DETAILS | 10 +++++-----
x11/nxcomp/HISTORY | 7 +++++++
x11/nxcomp/PRE_BUILD | 3 ++-
x11/nxproxy/0001-respect-CXXFLAGS.patch | 28 ++++++++++++++++++++++++++++
x11/nxproxy/DEPENDS | 2 ++
x11/nxproxy/DETAILS | 15 +++++++++++++++
x11/nxproxy/HISTORY | 3 +++
x11/nxproxy/PRE_BUILD | 4 ++++
x11/x2goclient/BUILD | 1 +
x11/x2goclient/DEPENDS | 7 +++++++
x11/x2goclient/DETAILS | 20 ++++++++++++++++++++
x11/x2goclient/HISTORY | 3 +++
x11/x2goclient/INSTALL | 8 ++++++++
20 files changed, 149 insertions(+), 13 deletions(-)

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

x11/x2goclient: new spell, Qt client for the x2go remote desktop

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

x11/nxproxy: new spell, NX proxy library

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

x11/nxcomp: enforce CXXFLAGS

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

devel/git: version 1.8.2.1

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

graphics/imagemagick: version 6.8.4-8

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

x11/nxcomp: version 3.5.0-2

diff --git a/ChangeLog b/ChangeLog
index 0713eea..05cea06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * x11/nxproxy: new spell, NX proxy library
+ * x11/x2goclient: new spell, Qt client for the x2go remote desktop
+
2013-04-10 Treeve Jelbert <treeve AT sourcemage.org>
* ruby-raa/ruby-2.0: new stable version of ruby

diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 799c41b..debe309 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,10 +1,10 @@
SPELL=git
- VERSION=1.8.2
+ VERSION=1.8.2.1
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.sign
# SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
-
SOURCE_HASH=sha512:08274649a525879e2e5a6940cfd6e8b48c30e551ca1b63c7c73198a4777b643e60a0fd2a51bc6f4623b438d5168dd53c42b4daf87b80d52cfac3cd1cfa368976
+
SOURCE_HASH=sha512:d75a36a91b0522ca3a5c792473e16fc98dd9de082b4c0e9a75ebc525fa334edfdcb6dbf138e1bdede711f2158f24e8a8ba8499b89f9a82be1b5e60eb4ba5d33e
SOURCE_URL=http://git-core.googlecode.com/files/$SOURCE
# SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
# SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
SOURCE3=$SPELL-manpages-$VERSION.tar.gz
# SOURCE4=$SOURCE3.sign
# SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
-
SOURCE3_HASH=sha512:6f8fa833b31fb8b3c0d9ce1cbc05ef3295c4ecc15703e878b5f1a86244241db399b20b5ee167cbf8989b70c6d72efa3410d47adc9b31b648bc2c901d9041d238
+
SOURCE3_HASH=sha512:a6463c8bc8a23301d89e985b88fa0073c154e126c51a1f7699cd09e79723ed463f46a9cf5dd63f9e2e46ee4111e6154ae86553bd446f5cf76db9fd4e3bff5a1f
SOURCE3_URL=http://git-core.googlecode.com/files/$SOURCE3
# SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
# SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
SOURCE5=$SPELL-htmldocs-$VERSION.tar.gz
# SOURCE6=$SOURCE5.sign
# SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
-
SOURCE5_HASH=sha512:0665ec103487ee2b796607b5d19492d60ee2b62af46a87f38fa5973da66ca6fc75f5df5f8a3fd8e926a28c578ff30342e52f25da7084fc02c685289fc7d7689b
+
SOURCE5_HASH=sha512:8e7f25a0b230473f9e9290f61e9ea80a675459eea163ef76e281aa95747f5bc4df2ddb7f9bba9c2b0fb75819cd206f2415ba665bc986a628a07e8da4e5aa6efc
SOURCE5_URL=http://git-core.googlecode.com/files/$SOURCE5
# SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
# SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index c883173..9900e1a 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2013-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.8.2.1
+
2013-03-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.2

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index fe06d54..59ea3a5 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.8.4-6
+ VERSION=6.8.4-8
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
SOURCE_URL[1]=ftp://ftp.surfnet.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
-
SOURCE_HASH=sha512:35d6d883351818a52f0dd0d23434fa53bb60b564fdbecb608f537aef2b7ddde2de38ab726146a42d1c3456196009786a7bcfd3db89fe3e2001f43d70ada95a69
+
SOURCE_HASH=sha512:faf3adbdb528f2c7571af097feffe86fdfe09b868a7889689cd009f11ef1e2e54f491031a8b2f080ba38f35196380e836981df537d364cfde5aef0e615c5c971
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index c33bcf2..16590b5 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2013-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.8.4-8
+
2013-04-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 6.8.4-6

diff --git a/x11/nxcomp/0001-respect-CXXFLAGS.patch
b/x11/nxcomp/0001-respect-CXXFLAGS.patch
new file mode 100644
index 0000000..4945859
--- /dev/null
+++ b/x11/nxcomp/0001-respect-CXXFLAGS.patch
@@ -0,0 +1,26 @@
+From 5993fd4c4fa70b31525924322f031dd1039033d1 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Tue, 9 Apr 2013 18:49:58 +0200
+Subject: [PATCH] respect CXXFLAGS
+
+---
+ configure.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index e9ab81d..e102c2a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -7,8 +7,7 @@ AC_PREREQ(2.13)
+
+ dnl Set our default compilation flags.
+
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="${CXXFLAGS} -fno-rtti -fno-exceptions"
+
+ dnl Reset default linking directives.
+
+--
+1.8.2
+
diff --git a/x11/nxcomp/DEPENDS b/x11/nxcomp/DEPENDS
index ccc6b11..c5aeb36 100755
--- a/x11/nxcomp/DEPENDS
+++ b/x11/nxcomp/DEPENDS
@@ -1,4 +1,5 @@
depends JPEG &&
depends libpng &&
depends -sub CXX gcc &&
-depends X11-SERVER
+depends X11-SERVER &&
+depends autoconf
diff --git a/x11/nxcomp/DETAILS b/x11/nxcomp/DETAILS
index 590854b..c003d58 100755
--- a/x11/nxcomp/DETAILS
+++ b/x11/nxcomp/DETAILS
@@ -1,9 +1,9 @@
SPELL=nxcomp
- VERSION=1
- SOURCE="${SPELL}_3.3.0-3-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://x2go.obviously-nice.de/deb/pool/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:aaa77d111eb8f1534c70ccfd036deaa0066be9df8ccb602c476b108993fdc2539572ef8858e975cd0836db73c16c64b40dadb10ae036642d68afb1665a37fb2d
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-3.3.0-3"
+ VERSION=3.5.0-2
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://64.34.173.142/download/${VERSION%-*}/sources/${SOURCE}
+
SOURCE_HASH=sha512:a16570404837fd82d17a9e22fe23dff73a441523e3d90a8062ccff384ef9a226098642e8debee8bdd2823d04b3d63ce253e95e3ad49ec1ba011ebda5cbfbd7b0
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
WEB_SITE="http://www.nomachine.com";
LICENSE[0]=GPL
ENTERED=20110318
diff --git a/x11/nxcomp/HISTORY b/x11/nxcomp/HISTORY
index af01f42..4348b38 100644
--- a/x11/nxcomp/HISTORY
+++ b/x11/nxcomp/HISTORY
@@ -1,3 +1,10 @@
+2013-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-respect-CXXFLAGS.patch: force the spell
+ to respect CXXFLAGS
+
+2013-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.5.0-2
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/x11/nxcomp/PRE_BUILD b/x11/nxcomp/PRE_BUILD
index a98ca9e..fd366d5 100755
--- a/x11/nxcomp/PRE_BUILD
+++ b/x11/nxcomp/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SCRIPT_DIRECTORY/Loop.cpp.diff
+patch -p1 < $SPELL_DIRECTORY/0001-respect-CXXFLAGS.patch &&
+autoreconf -fi
diff --git a/x11/nxproxy/0001-respect-CXXFLAGS.patch
b/x11/nxproxy/0001-respect-CXXFLAGS.patch
new file mode 100644
index 0000000..1b52690
--- /dev/null
+++ b/x11/nxproxy/0001-respect-CXXFLAGS.patch
@@ -0,0 +1,28 @@
+From d3a45f25c19f966ada92a6b4bf3d5e0bd3a5f7b2 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Tue, 9 Apr 2013 18:46:05 +0200
+Subject: [PATCH] respect CXXFLAGS
+
+---
+ configure.in | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index bd930f1..9ba873a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -5,11 +5,6 @@ dnl Prolog
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+
+ if test -d "../nx-X11/exports/include" ; then
+--
+1.8.2
+
diff --git a/x11/nxproxy/DEPENDS b/x11/nxproxy/DEPENDS
new file mode 100755
index 0000000..8b72ee7
--- /dev/null
+++ b/x11/nxproxy/DEPENDS
@@ -0,0 +1,2 @@
+depends nxcomp &&
+depends autoconf
diff --git a/x11/nxproxy/DETAILS b/x11/nxproxy/DETAILS
new file mode 100755
index 0000000..2be8188
--- /dev/null
+++ b/x11/nxproxy/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=nxproxy
+ VERSION=3.5.0-1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://64.34.173.142/download/${VERSION%-*}/sources/${SOURCE}
+
SOURCE_HASH=sha512:9cffce5044289273fff6d26b865f20efd57a9c72f47e8c8b7feb5487e1fcb56252a45c1d50c4431d930cc14ccbd8db2adc5bf7ea96f65cb961b96fa68aeafe06
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+ WEB_SITE="http://www.nomachine.com";
+ LICENSE[0]=GPL
+ ENTERED=20110318
+ SHORT="NX X compression library"
+cat << EOF
+NX provides a differential X compression library for X11.
+
+This package provides the X proxy binary.
+EOF
diff --git a/x11/nxproxy/HISTORY b/x11/nxproxy/HISTORY
new file mode 100644
index 0000000..9c40cf7
--- /dev/null
+++ b/x11/nxproxy/HISTORY
@@ -0,0 +1,3 @@
+2013-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 0001-respect-CXXFLAGS.patch, DEPENDS, DETAILS, PRE_BUILD: spell
created
+
diff --git a/x11/nxproxy/PRE_BUILD b/x11/nxproxy/PRE_BUILD
new file mode 100755
index 0000000..b60a616
--- /dev/null
+++ b/x11/nxproxy/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SPELL_DIRECTORY}/0001-respect-CXXFLAGS.patch &&
+autoreconf -fi
diff --git a/x11/x2goclient/BUILD b/x11/x2goclient/BUILD
new file mode 100755
index 0000000..eec3de4
--- /dev/null
+++ b/x11/x2goclient/BUILD
@@ -0,0 +1 @@
+qt4_build
diff --git a/x11/x2goclient/DEPENDS b/x11/x2goclient/DEPENDS
new file mode 100755
index 0000000..5dc14a2
--- /dev/null
+++ b/x11/x2goclient/DEPENDS
@@ -0,0 +1,7 @@
+depends qt4 &&
+depends nxproxy &&
+depends nxcomp &&
+depends X11-SERVER &&
+depends openldap &&
+depends libssh &&
+depends cups
diff --git a/x11/x2goclient/DETAILS b/x11/x2goclient/DETAILS
new file mode 100755
index 0000000..a28b2bc
--- /dev/null
+++ b/x11/x2goclient/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=x2goclient
+ VERSION=4.0.1.0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://code.x2go.org/releases/source/x2goclient/${SOURCE}
+
SOURCE_HASH=sha512:6127df3826f79b72562d8184b1d3742f4cf5704f13db3b0eb8cbef32e99863dc7894785e289742fa39cad26965f8615b601bd86d8b9ca94de352c9db24acd141
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.x2go.org";
+ LICENSE[0]=GPL
+ ENTERED=20130411
+ SHORT="a Qt4 client for the x2go remote desktop"
+cat << EOF
+x2go is an open source terminal server project offering a comprehensive
+"server based computing" solution. Combining the advantages of existing
+systems it features ease of use, performance and scalability. x2go provides
+you with access to your desktop as an individual as well as a corporate user
+- from within your own network and via the internet. x2go is not limited to
+any particular hardware, it supports a variety of devices and architectures.
+
+This spell builds the Qt4 client for x2go.
+EOF
diff --git a/x11/x2goclient/HISTORY b/x11/x2goclient/HISTORY
new file mode 100644
index 0000000..155bc6a
--- /dev/null
+++ b/x11/x2goclient/HISTORY
@@ -0,0 +1,3 @@
+2013-04-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/x11/x2goclient/INSTALL b/x11/x2goclient/INSTALL
new file mode 100755
index 0000000..ea90cb5
--- /dev/null
+++ b/x11/x2goclient/INSTALL
@@ -0,0 +1,8 @@
+install -m755 ${SOURCE_DIRECTORY}/x2goclient \
+ ${INSTALL_ROOT}/usr/bin/ &&
+install -m644 ${SOURCE_DIRECTORY}/desktop/x2goclient.desktop \
+ ${INSTALL_ROOT}/usr/share/applications/ &&
+for res in 128x128 64x64 32x32 16x16; do
+ install -m644 ${SOURCE_DIRECTORY}/icons/${res}/x2goclient.png \
+ ${INSTALL_ROOT}/usr/share/icons/hicolor/${res}/apps/
+done


  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8bbb1600b9a6c037647617f9e05b52cb85c7d13a), Florian Franzmann, 04/11/2013

Archive powered by MHonArc 2.6.24.

Top of Page