[Frugalware-darcs] frugalware-current: djvulibre-3.5.19-2-i686
crazy
crazy at frugalware.org
Fri Apr 20 16:02:15 CEST 2007
Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070420135348-f6986-0ff7bf3492c6010e0f7b74a36850356f19dd0c04.gz;
[djvulibre-3.5.19-2-i686
crazy <crazy at frugalware.org>**20070420135348
* fixed depends,makedepends,subdepends,subrodepens
* added missing install scriptlet for the gui part
* fix *FLAGS
* workaround SMP issues
* well last time I fix it. I said already _I_ don't want to maintain it _as_ is now
* so voroskoi take over or let ngaba foo guy maintain it , I don't care.
] {
addfile ./source/xlib/djvulibre/fix-all-FLAGS.patch
addfile ./source/xlib/djvulibre/djview.install
hunk ./source/xlib/djvulibre/FrugalBuild 6
-pkgrel=1
+pkgrel=2
hunk ./source/xlib/djvulibre/FrugalBuild 9
-makedepends=('kdelibs' 'gnome-mime-data' 'gnome-icon-theme' 'htop')
-rodepends=('xdg-utils')
+makedepends=('kdelibs' 'gnome-mime-data' 'gnome-icon-theme' 'htop' 'xdg-utils')
+rodepends=('xdg-utils')
hunk ./source/xlib/djvulibre/FrugalBuild 19
-source=(${source[@]} head_-n1.patch)
+source=(${source[@]} head_-n1.patch fix-all-FLAGS.patch)
hunk ./source/xlib/djvulibre/FrugalBuild 24
-subrodepends=('djvulibre')
+subrodepends=("$pkgname=$pkgver xdg-utils")
hunk ./source/xlib/djvulibre/FrugalBuild 27
+subinstall=djview.install
hunk ./source/xlib/djvulibre/FrugalBuild 34
+ unset MAKEFLAGS
hunk ./source/xlib/djvulibre/FrugalBuild 39
- --disable-desktopfiles \
+ --enable-desktopfiles \
hunk ./source/xlib/djvulibre/FrugalBuild 42
- ## desktopfiles installis doneon post_install now
hunk ./source/xlib/djvulibre/FrugalBuild 62
- 'df699c98fae73de45fb68bc6a7fe12d30a5c87bf')
+ 'df699c98fae73de45fb68bc6a7fe12d30a5c87bf'\
+ 'd39c386e650c3c50b45bb5ec7fc3198c7d3a1eb1')
hunk ./source/xlib/djvulibre/FrugalBuild 66
+
hunk ./source/xlib/djvulibre/djview.install 1
+post_install()
+{
+ /usr/share/djvu/djview3/desktop/register-djview-menu install
+}
+
+post_upgrade()
+{
+ post_install
+}
+
+
+pre_remove()
+{
+ /usr/share/djvu/djview3/desktop/register-djview-menu uninstall
+
+}
+
+op=$1
+shift
+
+$op $*
+
hunk ./source/xlib/djvulibre/fix-all-FLAGS.patch 1
+diff -Naur djvulibre-3.5.19/gui/bin2cpp/Makefile.in djvulibre-3.5.19-p/gui/bin2cpp/Makefile.in
+--- djvulibre-3.5.19/gui/bin2cpp/Makefile.in 2007-03-25 22:48:22.000000000 +0200
++++ djvulibre-3.5.19-p/gui/bin2cpp/Makefile.in 2007-04-20 14:57:06.000000000 +0200
+@@ -46,10 +46,10 @@
+ LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
+
+ INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
+-CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
+-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${FLAGS}
++CFLAGS += @CPPFLAGS@ @CFLAGS@ ${FLAGS}
++CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ ${FLAGS}
+
+ PROGRAMS = bin2cpp
+
+diff -Naur djvulibre-3.5.19/gui/nsdejavu/Makefile.in djvulibre-3.5.19-p/gui/nsdejavu/Makefile.in
+--- djvulibre-3.5.19/gui/nsdejavu/Makefile.in 2007-03-25 22:48:24.000000000 +0200
++++ djvulibre-3.5.19-p/gui/nsdejavu/Makefile.in 2007-04-20 14:57:36.000000000 +0200
+@@ -50,7 +50,7 @@
+ -I${top_srcdir}/gui/shared/res \
+ -I${top_srcdir}/gui/npsdk
+
+-CFLAGS = @CPPFLAGS@ ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS}
++CFLAGS += @CPPFLAGS@ ${DEFS} ${INCS} ${NSDEJAVU_CFLAGS}
+
+ LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS}
+
+diff -Naur djvulibre-3.5.19/libdjvu/Makefile.in djvulibre-3.5.19-p/libdjvu/Makefile.in
+--- djvulibre-3.5.19/libdjvu/Makefile.in 2007-03-25 22:48:34.000000000 +0200
++++ djvulibre-3.5.19-p/libdjvu/Makefile.in 2007-04-20 14:58:07.000000000 +0200
+@@ -52,10 +52,10 @@
+ LIBDJVU_VER = @LIBDJVU_VER@
+
+ INCS = -I${top_builddir} -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
+-CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
+-CXXFLAGS = ${FLAGS} ${CXXPICFLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
++CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
++CXXFLAGS += ${FLAGS} ${CXXPICFLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
+
+ all: ${LIBDJVU_LA}
+
+diff -Naur djvulibre-3.5.19/tools/jb2cmp/Makefile.in djvulibre-3.5.19-p/tools/jb2cmp/Makefile.in
+--- djvulibre-3.5.19/tools/jb2cmp/Makefile.in 2007-03-25 22:48:36.000000000 +0200
++++ djvulibre-3.5.19-p/tools/jb2cmp/Makefile.in 2007-04-20 14:58:30.000000000 +0200
+@@ -45,10 +45,10 @@
+ THREAD_CFLAGS = @THREAD_CFLAGS@
+
+ INCS = -I${top_builddir} -I${top_srcdir} -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${THREAD_LIBS} @LIBS@
+-CFLAGS = @CPPFLAGS@ @CFLAGS@ ${FLAGS}
+-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
++CFLAGS += @CPPFLAGS@ @CFLAGS@ ${FLAGS}
++CXXFLAGS += @CPPFLAGS@ @CXXFLAGS@ ${CXXRPOFLAGS} ${FLAGS}
+
+
+ OBJS = classify.o cuts.o frames.o patterns.o
+diff -Naur djvulibre-3.5.19/tools/Makefile.in djvulibre-3.5.19-p/tools/Makefile.in
+--- djvulibre-3.5.19/tools/Makefile.in 2007-03-25 22:48:35.000000000 +0200
++++ djvulibre-3.5.19-p/tools/Makefile.in 2007-04-20 14:58:55.000000000 +0200
+@@ -51,11 +51,11 @@
+ LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
+
+ INCS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libdjvu -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
+ MORELIBS= @LDFLAGS@ ${JPEG_LIBS} ${TIFF_LIBS} ${THREAD_LIBS} @LIBS@
+-CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
+-CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
++CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
++CXXFLAGS += ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
+
+ SUBDIRS = jb2cmp
+
+diff -Naur djvulibre-3.5.19/xmltools/Makefile.in djvulibre-3.5.19-p/xmltools/Makefile.in
+--- djvulibre-3.5.19/xmltools/Makefile.in 2007-03-25 22:48:36.000000000 +0200
++++ djvulibre-3.5.19-p/xmltools/Makefile.in 2007-04-20 14:59:16.000000000 +0200
+@@ -49,10 +49,10 @@
+ LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
+
+ INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
+-FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
++FLAGS = ${DEFS} ${INCS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
+ LIBS= @LDFLAGS@ ${JPEG_LIBS} ${THREAD_LIBS} @LIBS@
+-CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@
+-CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
++CFLAGS += ${FLAGS} @CPPFLAGS@ @CFLAGS@
++CXXFLAGS += ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@
+
+ PROGRAMS = djvutoxml djvuxmlparser
+
}
More information about the Frugalware-darcs
mailing list