From e521b9d92957b2321a103d3ca8f356dd1ed72198 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 13 Mar 2014 00:38:18 -0300 Subject: renamed mate-document-viewer-libre to atril-libre and mate-file-archiver-libre to engrampa-libre --- libre/atril-libre/PKGBUILD | 59 +++++++++++++++++++++ libre/atril-libre/atril.install | 13 +++++ libre/engrampa-libre/PKGBUILD | 50 ++++++++++++++++++ libre/engrampa-libre/engrampa.install | 13 +++++ libre/engrampa-libre/fr-rpm-bsdtar.patch | 60 ++++++++++++++++++++++ libre/mate-document-viewer-libre/PKGBUILD | 51 ------------------ .../mate-document-viewer.install | 13 ----- libre/mate-file-archiver-libre/PKGBUILD | 51 ------------------ libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch | 60 ---------------------- .../mate-file-archiver.install | 13 ----- 10 files changed, 195 insertions(+), 188 deletions(-) create mode 100644 libre/atril-libre/PKGBUILD create mode 100644 libre/atril-libre/atril.install create mode 100644 libre/engrampa-libre/PKGBUILD create mode 100644 libre/engrampa-libre/engrampa.install create mode 100644 libre/engrampa-libre/fr-rpm-bsdtar.patch delete mode 100644 libre/mate-document-viewer-libre/PKGBUILD delete mode 100644 libre/mate-document-viewer-libre/mate-document-viewer.install delete mode 100644 libre/mate-file-archiver-libre/PKGBUILD delete mode 100644 libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch delete mode 100644 libre/mate-file-archiver-libre/mate-file-archiver.install diff --git a/libre/atril-libre/PKGBUILD b/libre/atril-libre/PKGBUILD new file mode 100644 index 000000000..3f5b92481 --- /dev/null +++ b/libre/atril-libre/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 106531 2014-03-05 20:16:04Z flexiondotorg $ +# Maintainer : Martin Wimpress +# Maintainer (Parabola): André Silva + +_pkgname=atril +pkgname=atril-libre +pkgver=1.8.0 +pkgrel=1 +pkgdesc="Simply a document viewer, with libarchive recommendation" +url="http://mate-desktop.org" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libsm' 'libspectre' + 'mate-desktop' 'mate-icon-theme' 'poppler-glib' 'zlib') +makedepends=('caja' 'djvulibre' 'gobject-introspection' 'libgxps' 'mate-common' + 'perl-xml-parser' 'texlive-bin' 'yelp-tools') +optdepends=('caja: Document Properties extension' + 'djvulibre: DjVu support' + 'libgxps: XPS support' + 'p7zip: cbz and cb7 compressed comic books' + 'texlive-bin: DVI support' + 'libarchive: cbr compressed comic books' + 'yelp: for reading MATE help documents') +replaces=('mate-document-viewer' "$_pkgname") +provides=('mate-document-viewer' "$_pkgname=$pkgver") +conflicts=('mate-document-viewer' "$_pkgname") +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz") +sha1sums=('8327437ba12df61326b83342cea746d1764727d0') +install=${_pkgname}.install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${_pkgname} \ + --with-gtk=2.0 \ + --enable-gtk-doc \ + --enable-djvu \ + --enable-dvi \ + --enable-t1lib \ + --enable-pixbuf \ + --enable-comics \ + --enable-xps \ + --enable-introspection \ + --disable-static + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/libre/atril-libre/atril.install b/libre/atril-libre/atril.install new file mode 100644 index 000000000..bf6781f93 --- /dev/null +++ b/libre/atril-libre/atril.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/engrampa-libre/PKGBUILD b/libre/engrampa-libre/PKGBUILD new file mode 100644 index 000000000..a109e8839 --- /dev/null +++ b/libre/engrampa-libre/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 106530 2014-03-05 20:15:56Z flexiondotorg $ +# Maintainer : Martin Wimpress +# Maintainer (Parabola): André Silva + +_pkgname=engrampa +pkgname=engrampa-libre +pkgver=1.8.0 +pkgrel=1 +pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed" +url="http://mate-desktop.org" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +depends=('bzip2' 'caja' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' 'tar') +makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools') +optdepends=('unar: for RAR uncompression' + 'zip: for ZIP archives' 'unzip: for ZIP archives' + 'p7zip: 7zip compression utility' 'arj: for ARJ archives' + 'yelp: for reading MATE help documents') +replaces=('mate-file-archiver' "$_pkgname") +provides=('mate-file-archiver' "$_pkgname=$pkgver") +conflicts=('mate-file-archiver' "$_pkgname") +options=( '!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz" + fr-rpm-bsdtar.patch) +sha1sums=('511019cee95568a4951e9da12d8a7282c3f6af65' + '219b05a979bf6f249aaae27964f02345fd81168d') +install=${_pkgname}.install + +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + # This patch 'depends' on libarchive + patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch" +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${_pkgname} \ + --with-gtk=2.0 \ + --disable-static \ + --disable-packagekit + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/libre/engrampa-libre/engrampa.install b/libre/engrampa-libre/engrampa.install new file mode 100644 index 000000000..bf6781f93 --- /dev/null +++ b/libre/engrampa-libre/engrampa.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas/ + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/engrampa-libre/fr-rpm-bsdtar.patch b/libre/engrampa-libre/fr-rpm-bsdtar.patch new file mode 100644 index 000000000..93a783176 --- /dev/null +++ b/libre/engrampa-libre/fr-rpm-bsdtar.patch @@ -0,0 +1,60 @@ +This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio. +It is useful on systems that do not have cpio or RPM/YUM +This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives. + +------------------+ + rpm2cpio.c | 2 +- + fr-command-rpm.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +Index: src/commands/rpm2cpio.c +================================ +--- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31 ++++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-07-26 +@@ -128,7 +128,7 @@ + archive_command = "bzip2 -dc"; + fclose (stream); + +- command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); ++ command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); + + return system (command); + } +Index: src/fr-command-rpm.c +================================ +--- mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-03-31 ++++ mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-07-26 +@@ -175,7 +175,7 @@ + + fr_process_begin_command (comm->process, "sh"); + fr_process_add_arg (comm->process, "-c"); +- fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL); ++ fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL); + fr_process_end_command (comm->process); + fr_process_start (comm->process); + } +@@ -200,7 +200,7 @@ + + cmd = g_string_new (PRIVEXECDIR "rpm2cpio "); + g_string_append (cmd, comm->e_filename); +- g_string_append (cmd, " -idu "); ++ g_string_append (cmd, " -xf - "); + for (scan = file_list; scan; scan = scan->next) { + char *filename = g_shell_quote (scan->data); + g_string_append (cmd, filename); +@@ -233,7 +233,7 @@ + FrCommandCap capabilities; + + capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES; +- if (is_program_available ("cpio", check_command)) ++ if (is_program_available ("bsdtar", check_command)) + capabilities |= FR_COMMAND_CAN_READ; + + return capabilities; +@@ -244,7 +244,7 @@ + fr_command_rpm_get_packages (FrCommand *comm, + const char *mime_type) + { +- return PACKAGES ("cpio,rpm"); ++ return PACKAGES ("bsdtar,rpm"); + } diff --git a/libre/mate-document-viewer-libre/PKGBUILD b/libre/mate-document-viewer-libre/PKGBUILD deleted file mode 100644 index 969c335b2..000000000 --- a/libre/mate-document-viewer-libre/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer : Martin Wimpress - -_pkgname=mate-document-viewer -pkgname=mate-document-viewer-libre -pkgver=1.6.2 -pkgrel=2 -pkgdesc="Simply a document viewer, with libarchive recommendation" -url="http://mate-desktop.org" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver -depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libmatekeyring' 'libsm' - 'libspectre' 'mate-desktop' 'mate-icon-theme' 'poppler-glib' 'zlib') -makedepends=('djvulibre' 'gobject-introspection' 'libgxps' 'mate-common' - 'mate-doc-utils' 'mate-file-manager' 'perl-xml-parser' 'texlive-bin') -optdepends=('djvulibre: DjVu support' - 'libgxps: XPS support' - 'mate-file-manager: Document Properties extension' - 'p7zip: cbz and cb7 compressed comic books' - 'texlive-bin: DVI support' - 'libarchive: cbr compressed comic books') -options=('!emptydirs') -groups=('mate-extra') -source=("http://pub.mate-desktop.org/releases/1.6/${_pkgname}-${pkgver}.tar.xz") -sha1sums=('295a59e7b7babd86f42eebb2a9ac5405dd7b2997') -install=${_pkgname}.install - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/${_pkgname} \ - --enable-gtk-doc \ - --enable-djvu \ - --enable-dvi \ - --enable-t1lib \ - --enable-pixbuf \ - --enable-comics \ - --enable-introspection \ - --disable-static \ - --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - ln -s atril "${pkgdir}/usr/bin/mate-document-viewer" -} diff --git a/libre/mate-document-viewer-libre/mate-document-viewer.install b/libre/mate-document-viewer-libre/mate-document-viewer.install deleted file mode 100644 index bf6781f93..000000000 --- a/libre/mate-document-viewer-libre/mate-document-viewer.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas/ - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/mate-file-archiver-libre/PKGBUILD b/libre/mate-file-archiver-libre/PKGBUILD deleted file mode 100644 index 80711e259..000000000 --- a/libre/mate-file-archiver-libre/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer : Martin Wimpress - -_pkgname=mate-file-archiver -pkgname=mate-file-archiver-libre -pkgver=1.6.2 -pkgrel=1 -pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed" -url="http://mate-desktop.org" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver -depends=('bzip2' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' - 'mate-file-manager' 'tar') -makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') -optdepends=('arj: for ARJ support' - 'p7zip: for 7zip support' - 'unar: for RAR extract support' - 'unzip: for ZIP extract support' - 'zip: for ZIP support') -options=('!emptydirs') -groups=('mate-extra') -source=("http://pub.mate-desktop.org/releases/1.6/${_pkgname}-${pkgver}.tar.xz" - fr-rpm-bsdtar.patch) -sha1sums=('58a0f7d78dabd627a3a2b3352fabcba20d72aa92' - '219b05a979bf6f249aaae27964f02345fd81168d') -install=${_pkgname}.install - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - # This patch 'depends' on libarchive - patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch" -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/${_pkgname} \ - --disable-static \ - --disable-scrollkeeper \ - --disable-packagekit - mate-doc-prepare --force - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch b/libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch deleted file mode 100644 index 93a783176..000000000 --- a/libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch +++ /dev/null @@ -1,60 +0,0 @@ -This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio. -It is useful on systems that do not have cpio or RPM/YUM -This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives. - -------------------+ - rpm2cpio.c | 2 +- - fr-command-rpm.c | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -Index: src/commands/rpm2cpio.c -================================ ---- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31 -+++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-07-26 -@@ -128,7 +128,7 @@ - archive_command = "bzip2 -dc"; - fclose (stream); - -- command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); -+ command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); - - return system (command); - } -Index: src/fr-command-rpm.c -================================ ---- mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-03-31 -+++ mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-07-26 -@@ -175,7 +175,7 @@ - - fr_process_begin_command (comm->process, "sh"); - fr_process_add_arg (comm->process, "-c"); -- fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL); -+ fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL); - fr_process_end_command (comm->process); - fr_process_start (comm->process); - } -@@ -200,7 +200,7 @@ - - cmd = g_string_new (PRIVEXECDIR "rpm2cpio "); - g_string_append (cmd, comm->e_filename); -- g_string_append (cmd, " -idu "); -+ g_string_append (cmd, " -xf - "); - for (scan = file_list; scan; scan = scan->next) { - char *filename = g_shell_quote (scan->data); - g_string_append (cmd, filename); -@@ -233,7 +233,7 @@ - FrCommandCap capabilities; - - capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES; -- if (is_program_available ("cpio", check_command)) -+ if (is_program_available ("bsdtar", check_command)) - capabilities |= FR_COMMAND_CAN_READ; - - return capabilities; -@@ -244,7 +244,7 @@ - fr_command_rpm_get_packages (FrCommand *comm, - const char *mime_type) - { -- return PACKAGES ("cpio,rpm"); -+ return PACKAGES ("bsdtar,rpm"); - } diff --git a/libre/mate-file-archiver-libre/mate-file-archiver.install b/libre/mate-file-archiver-libre/mate-file-archiver.install deleted file mode 100644 index bf6781f93..000000000 --- a/libre/mate-file-archiver-libre/mate-file-archiver.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas/ - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} -- cgit v1.2.3-54-g00ecf