sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6553ad8fca16eb4148481dbdbcd34d60aa833373)
- 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 (6553ad8fca16eb4148481dbdbcd34d60aa833373)
- Date: Fri, 25 Nov 2016 19:44:03 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
ChangeLog | 3 +
dev/null |binary
editors/scribus4/BUILD | 2
editors/scribus4/CONFLICTS | 2
editors/scribus4/DEPENDS | 20 ---------
editors/scribus4/DETAILS | 30 ++------------
editors/scribus4/DOWNLOAD | 1
editors/scribus4/HISTORY | 61
+-----------------------------
editors/scribus4/INSTALL | 1
editors/scribus4/PRE_BUILD | 1
editors/scribus4/UP_TRIGGERS | 1
editors/scribus4/desktop/scribus.desktop | 8 ---
fonts-x11/linuxlibertine/DETAILS | 13 +++---
fonts-x11/linuxlibertine/HISTORY | 4 +
fonts-x11/linuxlibertine/PRE_BUILD | 3 +
qt5-cmake/scribus/CONFIGURE | 1
qt5-cmake/scribus/CONFLICTS | 1
qt5-cmake/scribus/DEPENDS | 24 +++++++++++
qt5-cmake/scribus/DETAILS | 28 +++++++++++++
qt5-cmake/scribus/HISTORY | 3 +
qt5-cmake/scribus/desktop/scribus.desktop | 8 +++
21 files changed, 97 insertions(+), 118 deletions(-)
New commits:
commit 6553ad8fca16eb4148481dbdbcd34d60aa833373
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
linuxlibertine: => 5.3.0
commit 6091bdd578af51136e1567e909f6f5792b954f75
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
deprecate editors/scribus4 [replaced by scribus]
commit 5030ce385b093310f79a7f229edd77e7e7b507e9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
scribus-1.5.2
diff --git a/ChangeLog b/ChangeLog
index f2b2fad..00dcdde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-11-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * qt5-cmake/scribus: added, qt5 version of scribus
+
2016-11-23 Ismael Luceno <ismael AT sourcemage.org>
* chat-libs/c-toxcore: new spell, Secure instant messaging and
videoconferencing
diff --git a/editors/scribus4/BUILD b/editors/scribus4/BUILD
index 2113434..27ba77d 100755
--- a/editors/scribus4/BUILD
+++ b/editors/scribus4/BUILD
@@ -1 +1 @@
-qt4_cmake_build
+true
diff --git a/editors/scribus4/CONFLICTS b/editors/scribus4/CONFLICTS
index 20780dc..670a71b 100755
--- a/editors/scribus4/CONFLICTS
+++ b/editors/scribus4/CONFLICTS
@@ -1 +1 @@
-conflicts scribus
+conflicts scribus4 y
diff --git a/editors/scribus4/DEPENDS b/editors/scribus4/DEPENDS
deleted file mode 100755
index e38c3cb..0000000
--- a/editors/scribus4/DEPENDS
+++ /dev/null
@@ -1,20 +0,0 @@
-depends -sub CXX gcc &&
-depends qt4 &&
-depends cmake &&
-depends cairo &&
-depends freetype2 &&
-depends JPEG &&
-depends lcms &&
-depends libpng &&
-depends tiff &&
-depends zlib &&
-depends python &&
-depends cups &&
-depends libxml2 &&
-optional_depends fontconfig '' '' 'font selection' &&
-optional_depends pkgconfig '' '' 'finding other programs' &&
-optional_depends pillow '' '' 'font sampler preview' &&
-optional_depends boost '' '' '' &&
-optional_depends ghostscript '' '' 'PDF support'&&
-optional_depends aspell '' '' 'spell checking'
-
diff --git a/editors/scribus4/DETAILS b/editors/scribus4/DETAILS
index 5c9b3ad..d8a2d1f 100755
--- a/editors/scribus4/DETAILS
+++ b/editors/scribus4/DETAILS
@@ -1,28 +1,8 @@
SPELL=scribus4
- SPELLX=${SPELL//4}
- VERSION=1.4.2
- SOURCE=${SPELLX}-${VERSION}.tar.xz
- SOURCE2=$SOURCE.sig
- SOURCE2_IGNORE=signature
- SOURCE_GPG=scribus.gpg:$SOURCE2:UPSTREAM_KEY
-# SOURCE2=${SOURCE}.sig
-# SOURCE_GPG=scribus.gpg:${SOURCE}.sig:ESTABLISHED_UPSTREAM_KEY
-# SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELLX-$VERSION
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELLX}/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
-# SOURCE2_URL=${SOURCE_URL}.sig
- WEB_SITE=http://www.scribus.net/
- LICENSE[0]=GPL
- ENTERED=20090827
- KEYWORDS="qt editors"
- SHORT="Scribus is a desktop publishing program based on QT4"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-Scribus is a Layout program for Linux, similar to Adobe PageMaker,
-QuarkXPress or Adobe InDesign, except that it is published under the GNU GPL.
-Scribus has the ability to layout newsletters, create corporate stationery,
-small posters and other documents which need flexible layout and/or the
-ability to output to professional quality imagesetting equipment. You can do
-all the typical tasks like placing and rotating text and/or images on a page,
-specify manual kerning of type and much more.
+deprecated spell [replaced by scribus]
EOF
+
diff --git a/editors/scribus4/DOWNLOAD b/editors/scribus4/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/editors/scribus4/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/editors/scribus4/HISTORY b/editors/scribus4/HISTORY
index ed0f9a8..177fa71 100644
--- a/editors/scribus4/HISTORY
+++ b/editors/scribus4/HISTORY
@@ -1,57 +1,4 @@
-2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DETAILS: remove SOURCEFORGE_URL usage (automated)
-
-2013-08-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: pil -> pillow
-
-2013-01-15 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.4.2, bz2 -> xz, asc -> sig, SOURCE_DIRECTORY updated
- * scribus.gpg: F60166DA added, Peter Linnell <plinnell AT scribus.net>
-
-2012-11-15 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
- * DETAILS: fixed corrupted utf chars
-
-2012-05-07 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.4.1, gpg.sig -> asc, SOURCE_DIRECTORY updated
- * F60166DA.gpg: removed
- * scribus.gpg: added with key E782504E
-
-2012-01-02 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.4.0, sig -> gpg.sig
-
-2011-09-26 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: converted to upstream signature checking
- * F60166DA.gpg: added gpg keyring
-
-2011-08-23 Bor Kraljič <pyrobor AT ver.si>
- * scribus.gpg: moved to section folder
-
-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)
-
-2011-01-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: changed optional dependencies on python, cups and libxml2
to
- mandatory ones, added missing dependency on zlib
-
-2010-12-09 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 1.3.9
-
-2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
- * DEPENDS: jpeg -> JPEG
-
-2010-08-21 Finn Haedicke <finn AT sourcemage.org>
- * DETAILS: SOURCE updated
-
-2010-07-29 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.3.8, SOURCE updated
-
-2010-06-13 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.3.7
-
-2010-03-27 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.3.6, no sig file
-
-2009-08-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.3.5.1
- spell created
+2016-11-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by scribus]
diff --git a/editors/scribus4/INSTALL b/editors/scribus4/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/editors/scribus4/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/editors/scribus4/PRE_BUILD b/editors/scribus4/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/editors/scribus4/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/editors/scribus4/UP_TRIGGERS b/editors/scribus4/UP_TRIGGERS
new file mode 100755
index 0000000..489b36a
--- /dev/null
+++ b/editors/scribus4/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger scribus cast_self
diff --git a/editors/scribus4/desktop/scribus.desktop
b/editors/scribus4/desktop/scribus.desktop
deleted file mode 100644
index 4046c61..0000000
--- a/editors/scribus4/desktop/scribus.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Scribus
-Exec=scribus
-Icon=scribusicon.png
-Terminal=false
-Type=Application
-Categories=Application;Editor
diff --git a/editors/scribus4/scribus.gpg b/editors/scribus4/scribus.gpg
deleted file mode 100644
index dc17c7b..0000000
Binary files a/editors/scribus4/scribus.gpg and /dev/null differ
diff --git a/fonts-x11/linuxlibertine/DETAILS
b/fonts-x11/linuxlibertine/DETAILS
index 18770f3..3140132 100755
--- a/fonts-x11/linuxlibertine/DETAILS
+++ b/fonts-x11/linuxlibertine/DETAILS
@@ -1,11 +1,12 @@
SPELL=linuxlibertine
- SPELLX=LinLibertineFont
- VERSION=4.4.1
-
SOURCE_HASH=sha512:65183a34708085663a7ce797d4123bf8b82d055b1f7342876ac347ccdfacbcded786d434e5524bd62bc78a15e807b8b8f6ccf9e5c6ba11b6167bec3c560096dc
- SOURCE=$SPELLX-${VERSION}.tgz
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
+ SPELLX=LinLibertineTTF
+ VERSION=5.3.0
+ VX=2012_07_02
+
SOURCE_HASH=sha512:ea9af8d47d22e5f35be65fbae08c7230602a57abe6f39e9a63a5761a69e519fe4e4ac41b878764035fdf8a2c8ee855c0cb9b0077a216d8ba5a2ddf615913e273
+ SOURCE=${SPELLX}_${VERSION}_${VX}.tgz
+
SOURCE_URL[0]=https://sf.net/projects/${SPELL}/files/${SPELL}/${VERSION}/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELLX
- WEB_SITE=http://linuxlibertine.sourceforge.net/
+ WEB_SITE=https://linuxlibertine.sourceforge.net/
ENTERED=20060628
LICENSE[0]=GPL
SHORT="TrueType font family designed to replace Times New Roman"
diff --git a/fonts-x11/linuxlibertine/HISTORY
b/fonts-x11/linuxlibertine/HISTORY
index e864426..e71dff4 100644
--- a/fonts-x11/linuxlibertine/HISTORY
+++ b/fonts-x11/linuxlibertine/HISTORY
@@ -1,3 +1,7 @@
+2016-11-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.3.0
+ * PRE_BUILD: added
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)
diff --git a/fonts-x11/linuxlibertine/PRE_BUILD
b/fonts-x11/linuxlibertine/PRE_BUILD
new file mode 100755
index 0000000..fee3737
--- /dev/null
+++ b/fonts-x11/linuxlibertine/PRE_BUILD
@@ -0,0 +1,3 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file
diff --git a/qt5-cmake/scribus/CONFIGURE b/qt5-cmake/scribus/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/qt5-cmake/scribus/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/qt5-cmake/scribus/CONFLICTS b/qt5-cmake/scribus/CONFLICTS
new file mode 100755
index 0000000..bc643f7
--- /dev/null
+++ b/qt5-cmake/scribus/CONFLICTS
@@ -0,0 +1 @@
+conflicts scribus4
diff --git a/qt5-cmake/scribus/DEPENDS b/qt5-cmake/scribus/DEPENDS
new file mode 100755
index 0000000..b586fd3
--- /dev/null
+++ b/qt5-cmake/scribus/DEPENDS
@@ -0,0 +1,24 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
+depends qtdeclarative &&
+depends qttools &&
+depends qtwebkit &&
+depends cairo &&
+depends freetype2 &&
+depends JPEG &&
+depends lcms2 &&
+depends libpng &&
+depends tiff &&
+depends zlib &&
+depends python &&
+depends cups &&
+depends libxml2 &&
+optional_depends boost '' '' 'enhancements' &&
+optional_depends fontconfig '' '' 'font selection' &&
+optional_depends graphicsmagick '' ' -DWANT_GRAPHICSMAGICK=1' 'additional
image formats' &&
+optional_depends librevenge '' '' 'ODF support'
+optional_depends pkgconfig '' '' 'finding other programs' &&
+#optional_depends pillow '' '' 'font sampler preview' &&
+#optional_depends ghostscript '' '' 'PDF support'&&
+optional_depends hunspell '' '' 'spell checking' &&
+#optional_depends podofo '' '' ''
+optional_depends poppler '' '' 'PDF import'
diff --git a/qt5-cmake/scribus/DETAILS b/qt5-cmake/scribus/DETAILS
new file mode 100755
index 0000000..e819a12
--- /dev/null
+++ b/qt5-cmake/scribus/DETAILS
@@ -0,0 +1,28 @@
+ SPELL=scribus
+ VERSION=1.5.2
+
SOURCE_HASH=sha512:c3531bc5ef97e1f7d026ec7cff872ff7a6ea36472c794b632bee1a84fdeea87deaa56e8b9c467fe8e6db694266efc9ec84d822e5feefd2f99b4469d08826cea4
+ SOURCE=${SPELL}-${VERSION}.tar.xz
+# SOURCE2=$SOURCE.sig
+# SOURCE2_IGNORE=signature
+# SOURCE_GPG=scribus.gpg:$SOURCE2:UPSTREAM_KEY
+# SOURCE2=${SOURCE}.sig
+# SOURCE_GPG=scribus.gpg:${SOURCE}.sig:ESTABLISHED_UPSTREAM_KEY
+# SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-$VERSION
+
SOURCE_URL[0]=https://downloads.sourceforge.net/sourceforge/${SPELL}/$SOURCE
+# SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+# SOURCE2_URL=${SOURCE_URL}.sig
+ WEB_SITE=https://www.scribus.net/
+ LICENSE[0]=GPL
+ ENTERED=20161114
+ KEYWORDS="qt editors"
+ SHORT="Scribus is a desktop publishing program based on QT5"
+cat << EOF
+Scribus is a Layout program for Linux, similar to Adobe PageMaker,
+QuarkXPress or Adobe InDesign, except that it is published under the GNU GPL.
+Scribus has the ability to layout newsletters, create corporate stationery,
+small posters and other documents which need flexible layout and/or the
+ability to output to professional quality imagesetting equipment. You can do
+all the typical tasks like placing and rotating text and/or images on a page,
+specify manual kerning of type and much more.
+EOF
diff --git a/qt5-cmake/scribus/HISTORY b/qt5-cmake/scribus/HISTORY
new file mode 100644
index 0000000..538a460
--- /dev/null
+++ b/qt5-cmake/scribus/HISTORY
@@ -0,0 +1,3 @@
+2016-11-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.2
+ spell created
diff --git a/qt5-cmake/scribus/desktop/scribus.desktop
b/qt5-cmake/scribus/desktop/scribus.desktop
new file mode 100644
index 0000000..4046c61
--- /dev/null
+++ b/qt5-cmake/scribus/desktop/scribus.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Scribus
+Exec=scribus
+Icon=scribusicon.png
+Terminal=false
+Type=Application
+Categories=Application;Editor
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6553ad8fca16eb4148481dbdbcd34d60aa833373), Treeve Jelbert, 11/25/2016
Archive powered by MHonArc 2.6.24.