Browse Source

xap/scribus: Upgraded to scribus-1.4.6.

slackware-14.2
Damien Goutte-Gattat 6 years ago
parent
commit
e7c626d540
  1. 32
      xap/scribus/scribus-1.4.0-fix-paths.diff
  2. 1
      xap/scribus/scribus-1.4.4.tar.xz.sha1
  3. 28
      xap/scribus/scribus-1.4.6-fix-paths.diff
  4. 1
      xap/scribus/scribus-1.4.6.tar.xz.sha1
  5. 8
      xap/scribus/scribus.SlackBuild

32
xap/scribus/scribus-1.4.0-fix-paths.diff

@ -1,32 +0,0 @@
diff -Naur scribus-1.4.0.orig/CMakeLists.txt scribus-1.4.0/CMakeLists.txt
--- scribus-1.4.0.orig/CMakeLists.txt 2011-06-17 23:43:41.000000000 +0200
+++ scribus-1.4.0/CMakeLists.txt 2011-06-20 22:17:41.369309170 +0200
@@ -251,7 +251,7 @@
#Setp all the directories we will use
#MAN
CMAKE_POLICY(SET CMP0005 OLD)
-SET(MANDIR "share/man/")
+SET(MANDIR "man/")
IF(WANT_VERSIONING)
SET(SHAREDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/")
ELSE(WANT_VERSIONING)
@@ -261,15 +261,15 @@
#SHARE - use the default on Apple as TAG_VERSION is empty
IF(WIN32 OR OS2)
- SET(DOCDIR "share/doc/")
+ SET(DOCDIR "doc/")
ELSE (WIN32 OR OS2)
IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+ SET(DOCDIR "doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
IF(NOT WANT_VERSIONING)
- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/")
+ SET(DOCDIR "doc/${MAIN_DIR_NAME}-${VERSION}/")
ELSE(NOT WANT_VERSIONING)
- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
+ SET(DOCDIR "doc/${MAIN_DIR_NAME}-${VERSION}/")
ENDIF(NOT WANT_VERSIONING)
ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
ENDIF (WIN32 OR OS2)

1
xap/scribus/scribus-1.4.4.tar.xz.sha1

@ -1 +0,0 @@
7bd3b4a7d6e6262126079847c617b3a25ba8ab06 scribus-1.4.4.tar.xz

28
xap/scribus/scribus-1.4.6-fix-paths.diff

@ -0,0 +1,28 @@
diff -Naur scribus-1.4.6.orig/CMakeLists.txt scribus-1.4.6/CMakeLists.txt
--- scribus-1.4.6.orig/CMakeLists.txt 2016-01-02 22:34:35.000000000 +0100
+++ scribus-1.4.6/CMakeLists.txt 2016-07-17 13:08:43.382196370 +0200
@@ -275,7 +275,7 @@
#Setp all the directories we will use
#MAN
CMAKE_POLICY(SET CMP0005 OLD)
-SET(MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man/")
+SET(MANDIR "${CMAKE_INSTALL_PREFIX}/man/")
IF(WANT_VERSIONING)
SET(SHAREDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/")
ELSE(WANT_VERSIONING)
@@ -292,12 +292,12 @@
SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
ELSE (WIN32 OR OS2)
IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+ SET(DOCDIR "${CMAKE_INSTALL_PREFIX}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
IF(NOT WANT_VERSIONING)
- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
+ SET(DOCDIR "${CMAKE_INSTALL_PREFIX}/doc/${MAIN_DIR_NAME}/")
ELSE(NOT WANT_VERSIONING)
- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
+ SET(DOCDIR "${CMAKE_INSTALL_PREFIX}/doc/${MAIN_DIR_NAME}-${VERSION}/")
ENDIF(NOT WANT_VERSIONING)
ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
ENDIF (WIN32 OR OS2)

1
xap/scribus/scribus-1.4.6.tar.xz.sha1

@ -0,0 +1 @@
f04a2eecfb531af4beb99645f85165be161b00a3 scribus-1.4.6.tar.xz

8
xap/scribus/scribus.SlackBuild

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2009,2010,2011,2012,2013,2014 Damien Goutte-Gattat
# Copyright (C) 2009-2014,2016 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -26,7 +26,7 @@
# Source package infos
NAMESRC=${NAMESRC:-scribus}
VERSION=${VERSION:-1.4.4}
VERSION=${VERSION:-1.4.6}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.xz}
WGET=${WGET:-http://downloads.sourceforge.net/scribus/$ARCHIVE}
@ -76,14 +76,14 @@ if [ ! -r $ARCHIVE ]; then
mv $ARCHIVE.part $ARCHIVE
fi
sha1sum -c $ARCHIVE.sha1
NAME=$(tar ft $ARCHIVE | head -n 1 | cut -d / -f 1)
NAME=$(tar ft $ARCHIVE | head -n 1 | cut -d / -f 2)
# Compile
cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
patch -p 1 < $CWD/scribus-1.4.0-fix-paths.diff
patch -p 1 < $CWD/scribus-1.4.6-fix-paths.diff
mkdir build && cd build
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \

Loading…
Cancel
Save