Changeset 12477


Ignore:
Timestamp:
2008-09-02T02:08:07+02:00 (8 years ago)
Author:
lars
Message:

Fix glib2 build and increase package version number.

Location:
packages/libs/glib2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/glib2/Makefile

    r12471 r12477  
    1111PKG_NAME:=glib2 
    1212PKG_VERSION:=2.16.5 
    13 PKG_RELEASE:=1 
     13PKG_RELEASE:=2 
    1414 
    1515PKG_SOURCE:=glib-$(PKG_VERSION).tar.bz2 
  • packages/libs/glib2/patches/001-no_docs_and_tests.patch

    r11766 r12477  
    1 diff --git a/Makefile.in b/Makefile.in 
    2 --- a/Makefile.in 
    3 +++ b/Makefile.in 
    4 @@ -338,7 +338,7 @@ EXTRA_DIST = ChangeLog.pre-2-14 ChangeLog.pre-2-12 ChangeLog.pre-2-10 \ 
    5         gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in 
    6  TEST_PROGS =  
    7  AUTOMAKE_OPTIONS = 1.7 
    8 -SUBDIRS = . m4macros glib gobject gmodule gthread gio tests po docs 
    9 +SUBDIRS = . m4macros glib gobject gmodule gthread gio po 
    10  DIST_SUBDIRS = $(SUBDIRS) build 
    11  bin_SCRIPTS = glib-gettextize 
    12  AM_CPPFLAGS = \ 
    13 diff -urN glib-2.15.4/gio/Makefile.am glib-2.15.4.new/gio/Makefile.am 
    14 --- glib-2.15.4/gio/Makefile.am 2008-01-28 16:03:24.000000000 +0100 
    15 +++ glib-2.15.4.new/gio/Makefile.am     2008-07-11 15:49:27.000000000 +0200 
    16 @@ -123,7 +123,6 @@ 
    17  platform_libadd += -lshlwapi 
    18  endif 
    19   
    20 -SUBDIRS += tests 
    21   
    22  libgio_2_0_la_SOURCES =                \ 
    23         gappinfo.c              \ 
    24 diff -urN glib-2.15.4/gio/Makefile.in glib-2.15.4.new/gio/Makefile.in 
    25 --- glib-2.15.4/gio/Makefile.in 2008-01-28 17:54:34.000000000 +0100 
    26 +++ glib-2.15.4.new/gio/Makefile.in     2008-07-11 15:49:20.000000000 +0200 
    27 @@ -168,7 +168,7 @@ 
     1diff -urN glib-2.16.5.orig/gio/Makefile.in glib-2.16.5/gio/Makefile.in 
     2--- glib-2.16.5.orig/gio/Makefile.in    2008-09-02 01:43:09.000000000 +0200 
     3+++ glib-2.16.5/gio/Makefile.in 2008-09-02 01:47:01.000000000 +0200 
     4@@ -165,7 +165,7 @@ 
    285   distclean-recursive maintainer-clean-recursive 
    296 ETAGS = etags 
     
    3411 ACLOCAL = @ACLOCAL@ 
    3512 ALLOCA = @ALLOCA@ 
    36 @@ -379,7 +379,7 @@ 
     13@@ -380,7 +380,7 @@ 
    3714        pltcheck.sh $(NULL) 
    3815 TEST_PROGS =  
     
    4017-SUBDIRS = $(am__append_1) $(am__append_2) . $(am__append_4) tests 
    4118+SUBDIRS = $(am__append_1) $(am__append_2) . $(am__append_4) 
     19 @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gio-2.0.lib 
    4220 @HAVE_GNUC_VISIBILITY_TRUE@@OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh 
    4321 AM_CPPFLAGS = \ 
    44         -DG_LOG_DOMAIN=\"GLib-GIO\"                     \ 
     22diff -urN glib-2.16.5.orig/glib/Makefile.in glib-2.16.5/glib/Makefile.in 
     23--- glib-2.16.5.orig/glib/Makefile.in   2008-09-02 01:43:17.000000000 +0200 
     24+++ glib-2.16.5/glib/Makefile.in        2008-09-02 01:44:48.000000000 +0200 
     25@@ -396,8 +396,8 @@ 
     26 @ENABLE_REGEX_TRUE@gregex_c = gregex.c 
     27 @ENABLE_REGEX_FALSE@gregex_h =  
     28 @ENABLE_REGEX_TRUE@gregex_h = gregex.h 
     29-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests 
     30-DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests 
     31+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . 
     32+DIST_SUBDIRS = libcharset gnulib pcre update-pcre 
     33 AM_CPPFLAGS = \ 
     34        -I$(top_srcdir)                 \ 
     35        $(pcre_inc)                     \ 
     36diff -urN glib-2.16.5.orig/gobject/Makefile.in glib-2.16.5/gobject/Makefile.in 
     37--- glib-2.16.5.orig/gobject/Makefile.in        2008-09-02 01:43:06.000000000 +0200 
     38+++ glib-2.16.5/gobject/Makefile.in     2008-09-02 01:46:05.000000000 +0200 
     39@@ -343,7 +343,7 @@ 
     40 # GObject - GLib Type, Object, Parameter and Signal Library 
     41 # Copyright (C) 1997,98,99,2000 Tim Janik and Red Hat, Inc. 
     42 # 
     43-SUBDIRS = . tests 
     44+SUBDIRS = . 
     45 AM_CPPFLAGS = \ 
     46        -DG_LOG_DOMAIN=\"GLib-GObject\"         \ 
     47        -I$(top_srcdir)                         \ 
     48diff -urN glib-2.16.5.orig/Makefile.in glib-2.16.5/Makefile.in 
     49--- glib-2.16.5.orig/Makefile.in        2008-09-02 01:42:56.000000000 +0200 
     50+++ glib-2.16.5/Makefile.in     2008-09-02 01:44:05.000000000 +0200 
     51@@ -342,7 +342,7 @@ 
     52        gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in 
     53 TEST_PROGS =  
     54 AUTOMAKE_OPTIONS = 1.7 
     55-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs 
     56+SUBDIRS = . m4macros glib gmodule gthread gobject gio po 
     57 DIST_SUBDIRS = $(SUBDIRS) build 
     58 bin_SCRIPTS = glib-gettextize 
     59 AM_CPPFLAGS = \ 
Note: See TracChangeset for help on using the changeset viewer.