Attachment 42964 Details for Bug 33937 – rarian-0.8.1-system-tinyxml.patch

[patch] rarian-0.8.1-system-tinyxml.patch

rarian-0.8.1-system-tinyxml.patch (text/plain), 2.44 KB, created by Pacho Ramos on 2011-02-05 07:48:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pacho Ramos

Created: 2011-02-05 07:48:56 UTC

Size: 2.44 KB

patch

obsolete

>diff -ur rarian-0.8.1.orig/librarian/Makefile.am rarian-0.8.1/librarian/Makefile.am
>--- rarian-0.8.1.orig/librarian/Makefile.am	2008-09-01 20:40:21.000000000 +0200
>+++ rarian-0.8.1/librarian/Makefile.am	2011-02-05 16:41:26.000000000 +0100
>@@ -20,13 +20,7 @@
> if ENABLE_OMF_READ
> librarian_la_SOURCES  +=  	\
>     rarian-omf.h		\
>-    rarian-omf.cpp		\
>-    $(top_srcdir)/util/tinyxml.cpp			\
>-    $(top_srcdir)/util/tinyxml.h			\
>-    $(top_srcdir)/util/tinyxmlparser.cpp		\
>-    $(top_srcdir)/util/tinystr.cpp			\
>-    $(top_srcdir)/util/tinystr.h			\
>-    $(top_srcdir)/util/tinyxmlerror.cpp	
>+    rarian-omf.cpp
> endif
> 
> librarian_la_CFLAGS = -DDATADIR=\""$(datadir)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" -DI_KNOW_RARIAN_0_8_IS_UNSTABLE
>SÃ³lo en rarian-0.8.1/librarian: Makefile.am~
>diff -ur rarian-0.8.1.orig/librarian/rarian-omf.cpp rarian-0.8.1/librarian/rarian-omf.cpp
>--- rarian-0.8.1.orig/librarian/rarian-omf.cpp	2008-09-01 20:40:21.000000000 +0200
>+++ rarian-0.8.1/librarian/rarian-omf.cpp	2011-02-05 16:34:29.000000000 +0100
>@@ -26,7 +26,7 @@
> #include <dirent.h>
> #include <unistd.h>
> 
>-#include <../util/tinyxml.h>
>+#include <tinyxml.h>
> 
> #include <stdio.h>
> #include <sys/types.h>
>SÃ³lo en rarian-0.8.1/librarian: rarian-omf.cpp~
>diff -ur rarian-0.8.1.orig/util/Makefile.am rarian-0.8.1/util/Makefile.am
>--- rarian-0.8.1.orig/util/Makefile.am	2008-09-01 20:40:21.000000000 +0200
>+++ rarian-0.8.1/util/Makefile.am	2011-02-05 16:35:49.000000000 +0100
>@@ -39,32 +39,14 @@
> if ENABLE_SK_COMPAT
> rarian_sk_migrate_SOURCES =  \
>     rarian-sk-migrate.cpp    \
>-    tinystr.cpp             \
>-    tinyxml.cpp             \
>-    tinyxmlerror.cpp        \
>-    tinyxmlparser.cpp       \
>-    tinystr.h               \
>-    tinyxml.h               \
>     ../librarian/rarian-reg-full.h \
>     ../librarian/rarian-reg-full.c
> 
> rarian_sk_preinstall_SOURCES = \
>-    rarian-sk-preinstall.cpp \
>-    tinystr.cpp             \
>-    tinyxml.cpp             \
>-    tinyxmlerror.cpp        \
>-    tinyxmlparser.cpp       \
>-    tinystr.h               \
>-    tinyxml.h
>+    rarian-sk-preinstall.cpp
> 
> rarian_sk_get_cl_SOURCES =  \
>-    rarian-sk-get-cl.cpp    \
>-    tinystr.cpp             \
>-    tinyxml.cpp             \
>-    tinyxmlerror.cpp        \
>-    tinyxmlparser.cpp       \
>-    tinystr.h               \
>-    tinyxml.h
>+    rarian-sk-get-cl.cpp
> 
> rarian_sk_get_cl_CXXFLAGS = -DDATADIR=\""$(datadir)"\" -DLOCALSTATEDIR=\""$(localstatedir)"\"
> 
>SÃ³lo en rarian-0.8.1/util: Makefile.am~

Actions: View | Splinter Review

Attachments on bug 33937: 42964 | 126927

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.