From 09976e206e730f77eeca1a87ad06a72bf0debc1e Mon Sep 17 00:00:00 2001 From: Alexpux Date: Wed, 23 Jul 2014 16:39:07 +0400 Subject: [PATCH] rarian: New package. --- rarian/0.8-no-undefined.patch | 9 +++++++ rarian/0.8.1-file-uri.patch | 48 +++++++++++++++++++++++++++++++++++ rarian/PKGBUILD | 45 ++++++++++++++++++++++++++++++++ rarian/msysize.patch | 35 +++++++++++++++++++++++++ rarian/user-segfault.patch | 14 ++++++++++ 5 files changed, 151 insertions(+) create mode 100644 rarian/0.8-no-undefined.patch create mode 100644 rarian/0.8.1-file-uri.patch create mode 100644 rarian/PKGBUILD create mode 100644 rarian/msysize.patch create mode 100644 rarian/user-segfault.patch diff --git a/rarian/0.8-no-undefined.patch b/rarian/0.8-no-undefined.patch new file mode 100644 index 00000000..2b21a51f --- /dev/null +++ b/rarian/0.8-no-undefined.patch @@ -0,0 +1,9 @@ +--- origsrc/rarian-0.8.0/librarian/Makefile.am 2008-03-09 13:46:22.000000000 -0500 ++++ src/rarian-0.8.0/librarian/Makefile.am 2008-05-25 23:46:31.406250000 -0500 +@@ -30,4 +30,4 @@ + endif + + librarian_la_CFLAGS = -DDATADIR=\""$(datadir)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" -DI_KNOW_RARIAN_0_8_IS_UNSTABLE +-librarian_la_LDFLAGS = -export-symbols-regex "^rrn_.*" +\ No newline at end of file ++librarian_la_LDFLAGS = -export-symbols-regex "^rrn_.*" -no-undefined diff --git a/rarian/0.8.1-file-uri.patch b/rarian/0.8.1-file-uri.patch new file mode 100644 index 00000000..39237942 --- /dev/null +++ b/rarian/0.8.1-file-uri.patch @@ -0,0 +1,48 @@ +Make sure we don't end up with //UNC paths. + +--- origsrc/rarian-0.8.1/librarian/rarian-reg-full.c 2008-09-01 13:40:21.000000000 -0500 ++++ src/rarian-0.8.1/librarian/rarian-reg-full.c 2009-11-12 01:38:10.092197400 -0600 +@@ -703,8 +703,8 @@ process_section_path_full (RrnListEntry + } + if (entry->text[0] == '/') { + /* Absolute path */ +- new_uri = malloc (sizeof (char) * strlen(entry->text)+6); +- sprintf (new_uri, "file:/%s", entry->text); ++ new_uri = malloc (sizeof (char) * strlen(entry->text)+7); ++ sprintf (new_uri, "file://%s", entry->text); + free (entry->text); + entry->text = new_uri; + goto done; +--- origsrc/rarian-0.8.1/librarian/rarian-reg-utils.c 2008-09-01 13:40:21.000000000 -0500 ++++ src/rarian-0.8.1/librarian/rarian-reg-utils.c 2009-11-12 01:39:44.987162900 -0600 +@@ -723,7 +723,7 @@ process_path (RrnReg *reg) + { + char *prefix = NULL; + RrnSect *child = reg->children; +- if (!strncmp ("file://", reg->uri, 7)) { ++ if (!strncmp ("file:///", reg->uri, 8)) { + /* No processing needs done. The URI is already in the file: scheme */ + return; + } +@@ -782,8 +782,8 @@ process_section_path (char *owner_path, + } + if (section->uri[0] == '/') { + /* Absolute path */ +- new_uri = malloc (sizeof (char) * strlen(section->uri)+6); +- sprintf (new_uri, "file:/%s", section->uri); ++ new_uri = malloc (sizeof (char) * strlen(section->uri)+7); ++ sprintf (new_uri, "file://%s", section->uri); + free (section->uri); + section->uri = new_uri; + goto done; +--- origsrc/rarian-0.8.1/util/rarian-sk-preinstall.cpp 2008-09-01 13:40:21.000000000 -0500 ++++ src/rarian-0.8.1/util/rarian-sk-preinstall.cpp 2009-11-12 01:30:19.236576500 -0600 +@@ -97,7 +97,7 @@ process_new_url (char *input) + if (i == 1) { + /* Normal path. Add file:/ to the start */ + new_url = (char *) malloc (sizeof(char) * (strlen (input) + 7)); +- sprintf (new_url, "file:/%s", input); ++ sprintf (new_url, "file://%s", input); + } else { + /* Don't know what to do. Just copy and append file: to it */ + new_url = (char *) malloc (sizeof(char) * (strlen(input) + 6)); diff --git a/rarian/PKGBUILD b/rarian/PKGBUILD new file mode 100644 index 00000000..30921331 --- /dev/null +++ b/rarian/PKGBUILD @@ -0,0 +1,45 @@ +# Maintainer: Alexey Pavlov + +pkgname=rarian +pkgver=0.8.1 +pkgrel=1 +pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper." +arch=('i686' 'x86_64') +url="http://rarian.freedesktop.org/" +license=('GPL') +depends=('gcc-libs') +makedepends=('libxslt-python') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.bz2 + user-segfault.patch + msysize.patch + 0.8-no-undefined.patch + 0.8.1-file-uri.patch) +md5sums=('75091185e13da67a0ff4279de1757b94' + '457e9827197009cfa360911fe49a5ad7' + '6c088bee3cf5936fe3bc8960f27aceca' + 'a8a2143fa7a09e92169cf58b96d8f525' + '802b0425b56cae5b175534dc0fd6f0c7') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i ${srcdir}/user-segfault.patch + patch -Np1 -i ${srcdir}/msysize.patch + patch -Np2 -i ${srcdir}/0.8-no-undefined.patch + patch -Np2 -i ${srcdir}/0.8.1-file-uri.patch + + autoreconf -fi +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/rarian/msysize.patch b/rarian/msysize.patch new file mode 100644 index 00000000..40305022 --- /dev/null +++ b/rarian/msysize.patch @@ -0,0 +1,35 @@ +diff -Naur rarian-0.8.1-orig/config.guess rarian-0.8.1/config.guess +--- rarian-0.8.1-orig/config.guess 2008-09-01 22:44:56.000000000 +0400 ++++ rarian-0.8.1/config.guess 2014-07-23 15:14:46.899800000 +0400 +@@ -781,6 +781,9 @@ + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; +@@ -815,6 +818,9 @@ + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; +diff -Naur rarian-0.8.1-orig/config.sub rarian-0.8.1/config.sub +--- rarian-0.8.1-orig/config.sub 2008-09-01 22:44:56.000000000 +0400 ++++ rarian-0.8.1/config.sub 2014-07-23 15:15:01.017800000 +0400 +@@ -1217,7 +1217,7 @@ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ diff --git a/rarian/user-segfault.patch b/rarian/user-segfault.patch new file mode 100644 index 00000000..3311cecd --- /dev/null +++ b/rarian/user-segfault.patch @@ -0,0 +1,14 @@ +--- util/rarian-sk-get-cl.cpp~ 2008-07-28 19:23:28.000000000 +0200 ++++ util/rarian-sk-get-cl.cpp 2008-07-28 19:23:28.000000000 +0200 +@@ -160,6 +160,11 @@ + { + char *filename = NULL; + char *user = getenv ("USERNAME"); ++ ++ if (user == NULL) { ++ user = getenv ("USER"); ++ } ++ + char *basepath = NULL; + int i=0; + int last = 0;