Wed Aug 24 23:14:37 UTC 2011

2 files changed, 126 insertions, 4 deletions

diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
index f7bb06784..0bc1fcd14 100644
--- a/community/notion/PKGBUILD
+++ b/community/notion/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 54370 2011-08-17 15:48:41Z spupykin $
+# $Id: PKGBUILD 54702 2011-08-23 11:42:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com
 # Contributor: aunoor
 
 pkgname=notion
-pkgver=20110817
+pkgver=20110823
 pkgrel=1
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 depends=('glib2' 'gettext' 'lua' 'libxext' 'libsm')
-makedepends=('git' 'pkgconfig')
+makedepends=('git' 'pkgconfig'
+	     'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra')
 conflicts=('ion3')
 provides=('libtu' 'libextl')
-source=()
 
 _gitroot="git://notion.git.sourceforge.net/gitroot/notion/notion"
 _gitname="notion"
@@ -22,6 +22,11 @@ _gitroot2="git://notion.git.sourceforge.net/gitroot/notion/libtu"
 _gitname2="libtu"
 _gitroot3="git://notion.git.sourceforge.net/gitroot/notion/libextl"
 _gitname3="libextl"
+_gitroot4="git://notion.git.sourceforge.net/gitroot/notion/notion-doc"
+_gitname4="notion-doc"
+
+source=(doc-build-fix.patch)
+md5sums=('68b348427d0531d2679a8a8d97d51c7d')
 
 build() {
     cd ${srcdir}
@@ -51,6 +56,14 @@ build() {
     echo
     fi
 
+    if [ -d ${srcdir}/${_gitname}/${_gitname4} ]; then
+    echo
+        git pull origin
+    else
+        git clone --depth 1 ${_gitroot4}
+    echo
+    fi
+
     msg "GIT checkout done or server timeout"
 
     rm -rf ${srcdir}/${_gitname}-build
@@ -67,11 +80,14 @@ build() {
         -i system.mk
 
     make INCLUDES=-I${srcdir}/${_gitname}-build
+    (cd notion-doc && patch -p1 <$srcdir/doc-build-fix.patch)
+    (cd notion-doc && make -j1 TOPDIR=.. all)
 }
 
 package() {
     cd ${srcdir}/${_gitname}-build
     make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install
+    (cd notion-doc && make  PREFIX=${pkgdir}/usr TOPDIR=.. install)
     mkdir -p ${pkgdir}/usr/share/licenses/notion
     cp LICENSE ${pkgdir}/usr/share/licenses/notion
 }
diff --git a/community/notion/doc-build-fix.patch b/community/notion/doc-build-fix.patch
new file mode 100644
index 000000000..45cc19725
--- /dev/null
+++ b/community/notion/doc-build-fix.patch
@@ -0,0 +1,106 @@
+diff --git a/Makefile b/Makefile
+index 8cb5b6c..11c3ca0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,6 +19,12 @@ FNTEXES=ioncore.exports mod_tiling.exports \
+ 	mod_query.exports de.exports mod_menu.exports \
+ 	mod_dock.exports mod_sp.exports mod_statusbar.exports
+ 
++TEXSOURCES=conf-bindings.tex confintro.tex conf-menus.tex \
++	conf-statusbar.tex conf.tex conf-winprops.tex cstyle.tex designnotes.tex \
++	de.tex fdl.tex fnref.tex fullhierarchy.tex hookref.tex luaif.tex \
++	macros.tex miscref.tex notionconf.tex notionnotes.tex objectsimpl.tex objects.tex \
++	prelim.tex statusd.tex tricks.tex
++
+ RUBBER_DVI=rubber
+ RUBBER_PS=rubber -p
+ RUBBER_PDF=rubber -d
+@@ -31,14 +37,17 @@ TARGETS = notionconf notionnotes
+ nothing:
+ 	@ echo "Please read the README first."
+ 
+-%-dvi:
++%-dvi: $(TEXSOURCES)
+ 	$(RUBBER_DVI) $*
+-	
+-%-ps:
++	touch $@
++
++%-ps: $(TEXSOURCES)
+ 	$(RUBBER_PS) $*
++	touch $@
+ 
+-%-pdf:
++%-pdf: $(TEXSOURCES)
+ 	$(RUBBER_PDF) $*
++	touch $@
+ 
+ # Install
+ ######################################
+@@ -48,30 +57,38 @@ install:
+ 	for d in $(DOCS); do \
+ 	    for e in ps pdf dvi; do \
+ 	      test -f $$d.$$e && $(INSTALL) -m $(DATA_MODE) $$d.$$e $(DOCDIR); \
+-            done; \
++	    done; \
+ 	    $(INSTALLDIR) $(DOCDIR)/$$d; \
+-            for i in $$d/*; do \
+-                $(INSTALL) -m $(DATA_MODE) $$i $(DOCDIR)/$$i; \
++	    for i in $$d/*; do \
++	        $(INSTALL) -m $(DATA_MODE) $$i $(DOCDIR)/$$i; \
+ 	    done; \
+-        done
++	    rm -f $(DOCDIR)/$$d/*.log; \
++	    rm -f $(DOCDIR)/$$d/WARNINGS; \
++	    rm -f $(DOCDIR)/$$d/*.aux; \
++	    rm -f $(DOCDIR)/$$d/*.idx; \
++	    rm -f $(DOCDIR)/$$d/*.tex; \
++	    rm -f $(DOCDIR)/$$d/*.pl; \
++	done
+ 
+ # notionconf rules
+ ######################################
+ 
+-notionconf-dvi: fnlist.tex
+-notionconf-ps: fnlist.tex
+-notionconf-pdf: fnlist.tex
++notionconf-dvi: fnlist.tex $(TEXSOURCES)
++notionconf-ps: fnlist.tex $(TEXSOURCES)
++notionconf-pdf: fnlist.tex $(TEXSOURCES)
+ 
+-notionconf-html: $(FNTEXES)
++notionconf-html: $(FNTEXES) $(TEXSOURCES)
+ 	$(L2H) -split 3 notionconf
+ 	cp notion.css notionconf
++	touch $@
+ 
+ # notionnotes rules
+ ######################################
+ 
+-notionnotes-html: 
++notionnotes-html: $(TEXSOURCES)
+ 	$(L2H) -split 4 notionnotes
+ 	cp notion.css notionnotes
++	touch $@
+ 
+ # More generic rules
+ ######################################
+@@ -94,7 +111,7 @@ all-html: $(patsubst %, %-html, $(TARGETS))
+ 
+ clean:
+ 	rm -f $(FNTEXES) fnlist.tex
+-	rm -f *.aux *.toc *.log
++	rm -f *.aux *.toc *.log *.out
+ 	rm -f *.idx *.ild *.ilg *.ind
+         
+ realclean: clean
+@@ -111,7 +128,8 @@ $(TOPDIR)/%/exports.tex:
+ 	$(MAKE) -C $$(dirname $@) _exports_doc
+ 
+ %.exports: $(TOPDIR)/%/exports.tex
+-	cp $< $@
++	cat $< | sed 's|UTF8_STRING|UTF8\\_STRING|' >$@
++#	cp $< $@
+ 
+ # Function list
+ ######################################