From 4ac93228afaf8da847b4ec91aac9c43f3bef472c Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Fri, 30 May 2014 03:59:31 +0000 Subject: Fri May 30 03:50:04 UTC 2014 --- community/scribus/CalendarWizard.patch | 23 ----------------------- community/scribus/PKGBUILD | 13 +++++-------- 2 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 community/scribus/CalendarWizard.patch (limited to 'community/scribus') diff --git a/community/scribus/CalendarWizard.patch b/community/scribus/CalendarWizard.patch deleted file mode 100644 index b47bfd60e..000000000 --- a/community/scribus/CalendarWizard.patch +++ /dev/null @@ -1,23 +0,0 @@ -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() - - diff --git a/community/scribus/PKGBUILD b/community/scribus/PKGBUILD index 1fadb25e3..fd67b3269 100644 --- a/community/scribus/PKGBUILD +++ b/community/scribus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108952 2014-04-08 00:11:52Z bisson $ +# $Id: PKGBUILD 112063 2014-05-29 04:49:23Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Daniel J Griffiths # Contributor: Ronald van Haren @@ -6,8 +6,8 @@ # Contributor: Ben pkgname=scribus -pkgver=1.4.3 -pkgrel=3 +pkgver=1.4.4 +pkgrel=1 pkgdesc='Desktop publishing software' url='http://www.scribus.net/' license=('GPL') @@ -17,16 +17,13 @@ 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') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") +sha1sums=('7bd3b4a7d6e6262126079847c617b3a25ba8ab06') 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|' \ -- cgit v1.2.3-54-g00ecf