Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5cc9cffd1ba67c3afd963a2f701fd6f85556fafc
commit 5cc9cffd1ba67c3afd963a2f701fd6f85556fafc
Author: bouleetbil <[EMAIL PROTECTED]>
Date: Sat Sep 27 16:49:31 2008 +0200
glib2-2.18.1-1-i686
*version bump
*delete useless patch
diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild
index cd6ec41..e79d9ad 100644
--- a/source/base/glib2/FrugalBuild
+++ b/source/base/glib2/FrugalBuild
@@ -4,11 +4,11 @@
USE_DOC=${USE_DOC:-"y"}
pkgname=glib2
-pkgver=2.16.5
+pkgver=2.18.1
pkgrel=1
pkgdesc="Common C routines used by GTK+2 and other libraries"
url="http://www.gtk.org/";
-depends=('glibc>=2.8-3')
+depends=('glibc>=2.8-6')
makedepends=('libgcrypt>=1.4.1-2')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
@@ -16,13 +16,11 @@ options=('scriptlet')
_F_gnome_name="glib"
_F_gnome_devel="n"
Finclude gnome
-source=($source fix-docs-build.patch)
_F_cd_path="glib-$pkgver"
## DON'T remove nor change the debug level or it breaks again ..
-sha1sums=('9f5921bd46ccdf4ad80084cf424b8516f2dddd19' \
- 'cdb40320dc0fedd7ea37ec253b02e1b2222b3fff')
+sha1sums=('d34a30cfccc8322dfe4198d26cf6bfc0210f141b')
if Fuse $USE_DOC; then
- makedepends=("[EMAIL PROTECTED]" 'gtk-doc>=1.8-2')
+ makedepends=("[EMAIL PROTECTED]" 'gtk-doc>=1.9')
Fconfopts="$Fconfopts --enable-gtk-doc"
subpkgs=("$pkgname-docs")
subdescs=("Glib2 Documentation")
diff --git a/source/base/glib2/fix-docs-build.patch
b/source/base/glib2/fix-docs-build.patch
deleted file mode 100644
index 7ad9188..0000000
--- a/source/base/glib2/fix-docs-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- gtk-doc.make.orig 2008-07-20 07:23:05.000000000 +0400
-+++ gtk-doc.make 2008-07-20 14:08:00.000000000 +0400
-@@ -107,7 +107,7 @@
- @-chmod -R u+w $(srcdir)
- rm -rf $(srcdir)/html
- mkdir $(srcdir)/html
-- cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE)
../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
-+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE)
../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES)
html )
- @echo 'gtk-doc: Fixing cross-references'
- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR)
$(FIXXREF_OPTIONS)
---- docs/reference/gobject/Makefile.in.orig 2008-07-20 07:01:57.000000000
+0400
-+++ docs/reference/gobject/Makefile.in 2008-07-20 14:11:53.000000000 +0400
-@@ -697,7 +697,7 @@
- @-chmod -R u+w $(srcdir)
- rm -rf $(srcdir)/html
- mkdir $(srcdir)/html
-- cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE)
../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
-+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE)
../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES)
html )
- @echo 'gtk-doc: Fixing cross-references'
- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR)
$(FIXXREF_OPTIONS)
---- docs/reference/glib/Makefile.in.orig 2008-07-20 07:01:57.000000000
+0400
-+++ docs/reference/glib/Makefile.in 2008-07-20 14:11:30.000000000 +0400
-@@ -713,7 +713,7 @@
- @-chmod -R u+w $(srcdir)
- rm -rf $(srcdir)/html
- mkdir $(srcdir)/html
-- cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE)
../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
-+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE)
../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES)
html )
- @echo 'gtk-doc: Fixing cross-references'
- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR)
$(FIXXREF_OPTIONS)
---- docs/reference/gio/Makefile.in.orig 2008-07-20 07:01:57.000000000
+0400
-+++ docs/reference/gio/Makefile.in 2008-07-20 14:11:11.000000000 +0400
-@@ -687,7 +687,7 @@
- @-chmod -R u+w $(srcdir)
- rm -rf $(srcdir)/html
- mkdir $(srcdir)/html
-- cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE)
../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
-+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE)
../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES)
html )
- @echo 'gtk-doc: Fixing cross-references'
- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR)
$(FIXXREF_OPTIONS)
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
