[arch-commits] Commit in scribus/repos (10 files)
Gaetan Bisson
bisson at nymeria.archlinux.org
Tue Apr 8 00:11:52 UTC 2014
Date: Tuesday, April 8, 2014 @ 02:11:52
Author: bisson
Revision: 108952
archrelease: copy trunk to community-i686, community-x86_64
Added:
scribus/repos/community-i686/CalendarWizard.patch
(from rev 108951, scribus/trunk/CalendarWizard.patch)
scribus/repos/community-i686/PKGBUILD
(from rev 108951, scribus/trunk/PKGBUILD)
scribus/repos/community-i686/install
(from rev 108951, scribus/trunk/install)
scribus/repos/community-x86_64/CalendarWizard.patch
(from rev 108951, scribus/trunk/CalendarWizard.patch)
scribus/repos/community-x86_64/PKGBUILD
(from rev 108951, scribus/trunk/PKGBUILD)
scribus/repos/community-x86_64/install
(from rev 108951, scribus/trunk/install)
Deleted:
scribus/repos/community-i686/PKGBUILD
scribus/repos/community-i686/install
scribus/repos/community-x86_64/PKGBUILD
scribus/repos/community-x86_64/install
---------------------------------------+
/PKGBUILD | 104 ++++++++++++++++++++++++++++++++
/install | 22 ++++++
community-i686/CalendarWizard.patch | 23 +++++++
community-i686/PKGBUILD | 48 --------------
community-i686/install | 11 ---
community-x86_64/CalendarWizard.patch | 23 +++++++
community-x86_64/PKGBUILD | 48 --------------
community-x86_64/install | 11 ---
8 files changed, 172 insertions(+), 118 deletions(-)
Copied: scribus/repos/community-i686/CalendarWizard.patch (from rev 108951, scribus/trunk/CalendarWizard.patch)
===================================================================
--- community-i686/CalendarWizard.patch (rev 0)
+++ community-i686/CalendarWizard.patch 2014-04-08 00:11:52 UTC (rev 108952)
@@ -0,0 +1,23 @@
+Modified: trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py
+URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18692&path=/trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py
+==============================================================================
+--- trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py (original)
++++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py Tue Jan 7 20:09:18 2014
+@@ -491,11 +491,11 @@
+ self.langLabel = Label(self, text='Select language:')
+
+ self.langFrame = Frame(self)
+- self.langFrame.pack()
+- self.langScrollbar = Scrollbar(self.langFrame)
+- self.langScrollbar.pack(fill=Y, side=RIGHT)
++ self.langFrame.grid()
++ self.langScrollbar = Scrollbar(self.langFrame, orient=VERTICAL)
++ self.langScrollbar.grid(row=0, column=1, sticky=N+S)
+ self.langListbox = Listbox(self.langFrame, selectmode=SINGLE, height=10, yscrollcommand=self.langScrollbar.set)
+- self.langListbox.pack(fill=X,side=LEFT)
++ self.langListbox.grid(row=0, column=0, sticky=N+S+E+W)
+ self.langScrollbar.config(command=self.langListbox.yview)
+
+ keys = localization.keys()
+
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-04-08 00:11:03 UTC (rev 108951)
+++ community-i686/PKGBUILD 2014-04-08 00:11:52 UTC (rev 108952)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: tobias <tobias at archlinux.org>
-# Contributor: Ben <ben at benmazer.net>
-
-pkgname=scribus
-pkgver=1.4.3
-pkgrel=2
-pkgdesc='Desktop publishing software'
-url='http://www.scribus.net/'
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=('cmake' 'boost' 'mesa')
-depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
- 'ghostscript' 'python2' 'podofo' 'boost-libs'
- 'desktop-file-utils' 'shared-mime-info')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('30c111762790e4407c13236bbb4b06f04e907f71')
-
-install=install
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop
- sed \
- -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
- -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
- -i scribus/plugins/scriptplugin/{samples,scripts}/*
- install -d ../build
-}
-
-build() {
- cd "${srcdir}/build"
- cmake "../${pkgname}-${pkgver}" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DLIB_SUFFIX=""
- make
-}
-
-package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
- install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop"
-}
Copied: scribus/repos/community-i686/PKGBUILD (from rev 108951, scribus/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-04-08 00:11:52 UTC (rev 108952)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: Ben <ben at benmazer.net>
+
+pkgname=scribus
+pkgver=1.4.3
+pkgrel=3
+pkgdesc='Desktop publishing software'
+url='http://www.scribus.net/'
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('cmake' 'boost' 'mesa')
+optdepends=('tk: scripts based on tkinter')
+depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
+ 'ghostscript' 'python2' 'podofo' 'boost-libs'
+ 'desktop-file-utils' 'shared-mime-info')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+ 'CalendarWizard.patch')
+sha1sums=('30c111762790e4407c13236bbb4b06f04e907f71'
+ 'a92629a98bc960a6f7f946faf2d6f06e9d1e9452')
+
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p2 -i ../CalendarWizard.patch
+ sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop
+ sed \
+ -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+ -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+ -i scribus/plugins/scriptplugin/{samples,scripts}/*
+ install -d ../build
+}
+
+build() {
+ cd "${srcdir}/build"
+ cmake "../${pkgname}-${pkgver}" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DLIB_SUFFIX=""
+ make
+}
+
+package() {
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop"
+}
Deleted: community-i686/install
===================================================================
--- community-i686/install 2014-04-08 00:11:03 UTC (rev 108951)
+++ community-i686/install 2014-04-08 00:11:52 UTC (rev 108952)
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: scribus/repos/community-i686/install (from rev 108951, scribus/trunk/install)
===================================================================
--- community-i686/install (rev 0)
+++ community-i686/install 2014-04-08 00:11:52 UTC (rev 108952)
@@ -0,0 +1,11 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: scribus/repos/community-x86_64/CalendarWizard.patch (from rev 108951, scribus/trunk/CalendarWizard.patch)
===================================================================
--- community-x86_64/CalendarWizard.patch (rev 0)
+++ community-x86_64/CalendarWizard.patch 2014-04-08 00:11:52 UTC (rev 108952)
@@ -0,0 +1,23 @@
+Modified: trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py
+URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18692&path=/trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py
+==============================================================================
+--- trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py (original)
++++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py Tue Jan 7 20:09:18 2014
+@@ -491,11 +491,11 @@
+ self.langLabel = Label(self, text='Select language:')
+
+ self.langFrame = Frame(self)
+- self.langFrame.pack()
+- self.langScrollbar = Scrollbar(self.langFrame)
+- self.langScrollbar.pack(fill=Y, side=RIGHT)
++ self.langFrame.grid()
++ self.langScrollbar = Scrollbar(self.langFrame, orient=VERTICAL)
++ self.langScrollbar.grid(row=0, column=1, sticky=N+S)
+ self.langListbox = Listbox(self.langFrame, selectmode=SINGLE, height=10, yscrollcommand=self.langScrollbar.set)
+- self.langListbox.pack(fill=X,side=LEFT)
++ self.langListbox.grid(row=0, column=0, sticky=N+S+E+W)
+ self.langScrollbar.config(command=self.langListbox.yview)
+
+ keys = localization.keys()
+
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-04-08 00:11:03 UTC (rev 108951)
+++ community-x86_64/PKGBUILD 2014-04-08 00:11:52 UTC (rev 108952)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: tobias <tobias at archlinux.org>
-# Contributor: Ben <ben at benmazer.net>
-
-pkgname=scribus
-pkgver=1.4.3
-pkgrel=2
-pkgdesc='Desktop publishing software'
-url='http://www.scribus.net/'
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=('cmake' 'boost' 'mesa')
-depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
- 'ghostscript' 'python2' 'podofo' 'boost-libs'
- 'desktop-file-utils' 'shared-mime-info')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('30c111762790e4407c13236bbb4b06f04e907f71')
-
-install=install
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop
- sed \
- -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
- -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
- -i scribus/plugins/scriptplugin/{samples,scripts}/*
- install -d ../build
-}
-
-build() {
- cd "${srcdir}/build"
- cmake "../${pkgname}-${pkgver}" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DLIB_SUFFIX=""
- make
-}
-
-package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
- install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop"
-}
Copied: scribus/repos/community-x86_64/PKGBUILD (from rev 108951, scribus/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-04-08 00:11:52 UTC (rev 108952)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: Ben <ben at benmazer.net>
+
+pkgname=scribus
+pkgver=1.4.3
+pkgrel=3
+pkgdesc='Desktop publishing software'
+url='http://www.scribus.net/'
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('cmake' 'boost' 'mesa')
+optdepends=('tk: scripts based on tkinter')
+depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
+ 'ghostscript' 'python2' 'podofo' 'boost-libs'
+ 'desktop-file-utils' 'shared-mime-info')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+ 'CalendarWizard.patch')
+sha1sums=('30c111762790e4407c13236bbb4b06f04e907f71'
+ 'a92629a98bc960a6f7f946faf2d6f06e9d1e9452')
+
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p2 -i ../CalendarWizard.patch
+ sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop
+ sed \
+ -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+ -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+ -i scribus/plugins/scriptplugin/{samples,scripts}/*
+ install -d ../build
+}
+
+build() {
+ cd "${srcdir}/build"
+ cmake "../${pkgname}-${pkgver}" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DLIB_SUFFIX=""
+ make
+}
+
+package() {
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop"
+}
Deleted: community-x86_64/install
===================================================================
--- community-x86_64/install 2014-04-08 00:11:03 UTC (rev 108951)
+++ community-x86_64/install 2014-04-08 00:11:52 UTC (rev 108952)
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: scribus/repos/community-x86_64/install (from rev 108951, scribus/trunk/install)
===================================================================
--- community-x86_64/install (rev 0)
+++ community-x86_64/install 2014-04-08 00:11:52 UTC (rev 108952)
@@ -0,0 +1,11 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list