corporate2/devel/system/base - drop bootsplashg

Ozan Çağlayan paketler-commits at pardus.org.tr
Wed Dec 8 13:57:26 EET 2010


Author: ozan.caglayan
Date: Wed Dec  8 13:57:26 2010
New Revision: 106775

Added:
   corporate2/devel/system/base/glib2/comar/
      - copied from r106097, 2011/devel/system/base/glib2/comar/
   corporate2/devel/system/base/glib2/files/glib-2.24-assert-test-failure.patch
   corporate2/devel/system/base/glib2/files/glib2.csh
      - copied unchanged from r106097, 2011/devel/system/base/glib2/files/glib2.csh
   corporate2/devel/system/base/glib2/files/glib2.sh
      - copied unchanged from r106097, 2011/devel/system/base/glib2/files/glib2.sh
Removed:
   corporate2/devel/system/base/bootsplash/
   corporate2/devel/system/base/bootsplash-theme-pardus/
Modified:
   corporate2/devel/system/base/glib2/   (props changed)
   corporate2/devel/system/base/glib2/files/fix-broken-gthread-pkgconfig.patch
   corporate2/devel/system/base/glib2/files/glib-2.20.5-drop-gio-desktop-app-info-test.patch
   corporate2/devel/system/base/glib2/pspec.xml
Log:
drop bootsplashg

---
 files/fix-broken-gthread-pkgconfig.patch               |    6 -
 files/glib-2.20.5-drop-gio-desktop-app-info-test.patch |   54 ++++++------
 files/glib-2.24-assert-test-failure.patch              |   19 ++++
 files/glib2.csh                                        |    6 +
 files/glib2.sh                                         |    6 +
 pspec.xml                                              |   72 +++++++++++++++--
 6 files changed, 125 insertions(+), 38 deletions(-)

Modified: corporate2/devel/system/base/glib2/files/fix-broken-gthread-pkgconfig.patch
=================================================================
--- corporate2/devel/system/base/glib2/files/fix-broken-gthread-pkgconfig.patch	(original)
+++ corporate2/devel/system/base/glib2/files/fix-broken-gthread-pkgconfig.patch	Wed Dec  8 13:57:26 2010
@@ -1,7 +1,7 @@
-Index: glib-2.22.3/configure.in
+Index: glib-2.22.3/configure.ac
 ===================================================================
---- glib-2.22.3.orig/configure.in
-+++ glib-2.22.3/configure.in
+--- glib-2.22.3.orig/configure.ac
++++ glib-2.22.3/configure.ac
 @@ -1925,7 +1925,7 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;

Modified: corporate2/devel/system/base/glib2/files/glib-2.20.5-drop-gio-desktop-app-info-test.patch
=================================================================
--- corporate2/devel/system/base/glib2/files/glib-2.20.5-drop-gio-desktop-app-info-test.patch	(original)
+++ corporate2/devel/system/base/glib2/files/glib-2.20.5-drop-gio-desktop-app-info-test.patch	Wed Dec  8 13:57:26 2010
@@ -1,26 +1,26 @@
-Index: glib-2.24.0/gio/tests/Makefile.in
+Index: glib-2.25.14/gio/tests/Makefile.in
 ===================================================================
---- glib-2.24.0.orig/gio/tests/Makefile.in
-+++ glib-2.24.0/gio/tests/Makefile.in
-@@ -39,7 +39,7 @@ host_triplet = @host@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/Makefile.decl
- noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
-- at OS_UNIX_TRUE@am__append_1 = live-g-file unix-streams desktop-app-info unix-fd
-+ at OS_UNIX_TRUE@am__append_1 = live-g-file unix-streams unix-fd
- subdir = gio/tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-@@ -55,7 +55,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- @OS_UNIX_TRUE at am__EXEEXT_1 = live-g-file$(EXEEXT) \
-- at OS_UNIX_TRUE@	unix-streams$(EXEEXT) desktop-app-info$(EXEEXT) \
-+ at OS_UNIX_TRUE@	unix-streams$(EXEEXT) \
- @OS_UNIX_TRUE@	unix-fd$(EXEEXT)
- am__EXEEXT_2 = memory-input-stream$(EXEEXT) \
- 	memory-output-stream$(EXEEXT) readwrite$(EXEEXT) \
-@@ -88,9 +88,6 @@ data_input_stream_DEPENDENCIES = $(progs
+--- glib-2.25.14.orig/gio/tests/Makefile.in
++++ glib-2.25.14/gio/tests/Makefile.in
+@@ -45,7 +45,7 @@ noinst_PROGRAMS = $(am__EXEEXT_5) $(am__
+ @OS_UNIX_TRUE@	gdbus-threading gdbus-export gdbus-error \
+ @OS_UNIX_TRUE@	gdbus-peer gdbus-exit-on-close gdbus-non-socket \
+ @OS_UNIX_TRUE@	application testapps appinfo contenttype file \
+- at OS_UNIX_TRUE@	$(NULL) live-g-file desktop-app-info unix-fd \
++ at OS_UNIX_TRUE@	$(NULL) live-g-file unix-fd \
+ @OS_UNIX_TRUE@	unix-streams
+ @OS_UNIX_TRUE at am__append_2 = gdbus-example-unix-fd-client
+ @OS_WIN32_TRUE at am__append_3 = win32-streams
+@@ -76,7 +76,7 @@ am__EXEEXT_1 =
+ @OS_UNIX_TRUE@	testapps$(EXEEXT) appinfo$(EXEEXT) \
+ @OS_UNIX_TRUE@	contenttype$(EXEEXT) file$(EXEEXT) \
+ @OS_UNIX_TRUE@	$(am__EXEEXT_1) live-g-file$(EXEEXT) \
+- at OS_UNIX_TRUE@	desktop-app-info$(EXEEXT) unix-fd$(EXEEXT) \
++ at OS_UNIX_TRUE@	unix-fd$(EXEEXT) \
+ @OS_UNIX_TRUE@	unix-streams$(EXEEXT)
+ @OS_WIN32_TRUE at am__EXEEXT_3 = win32-streams$(EXEEXT)
+ @HAVE_DBUS1_TRUE at am__EXEEXT_4 = gdbus-serialization$(EXEEXT)
+@@ -145,9 +145,6 @@ data_input_stream_DEPENDENCIES = $(progs
  am_data_output_stream_OBJECTS = data-output-stream.$(OBJEXT)
  data_output_stream_OBJECTS = $(am_data_output_stream_OBJECTS)
  data_output_stream_DEPENDENCIES = $(progs_ldadd)
@@ -30,8 +30,8 @@
  am_echo_server_OBJECTS = echo-server.$(OBJEXT)
  echo_server_OBJECTS = $(am_echo_server_OBJECTS)
  echo_server_DEPENDENCIES = $(progs_ldadd) \
-@@ -485,8 +482,6 @@ buffered_input_stream_SOURCES = buffered
- buffered_input_stream_LDADD = $(progs_ldadd)
+@@ -739,8 +736,6 @@ buffered_output_stream_SOURCES = buffere
+ buffered_output_stream_LDADD = $(progs_ldadd)
  live_g_file_SOURCES = live-g-file.c
  live_g_file_LDADD = $(progs_ldadd)
 -desktop_app_info_SOURCES = desktop-app-info.c
@@ -39,7 +39,7 @@
  unix_streams_SOURCES = unix-streams.c
  unix_streams_LDADD = $(progs_ldadd) \
  	$(top_builddir)/gthread/libgthread-2.0.la
-@@ -588,9 +583,6 @@ data-input-stream$(EXEEXT): $(data_input
+@@ -1013,9 +1008,6 @@ data-input-stream$(EXEEXT): $(data_input
  data-output-stream$(EXEEXT): $(data_output_stream_OBJECTS) $(data_output_stream_DEPENDENCIES) 
  	@rm -f data-output-stream$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(data_output_stream_OBJECTS) $(data_output_stream_LDADD) $(LIBS)
@@ -49,11 +49,11 @@
  echo-server$(EXEEXT): $(echo_server_OBJECTS) $(echo_server_DEPENDENCIES) 
  	@rm -f echo-server$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(echo_server_OBJECTS) $(echo_server_LDADD) $(LIBS)
-@@ -663,7 +655,6 @@ distclean-compile:
+@@ -1187,7 +1179,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/converter-stream.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/data-input-stream.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/data-output-stream.Po at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/desktop-app-info.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/echo-server.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/file.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/filter-cat.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/filter-streams.Po at am__quote@

Modified: corporate2/devel/system/base/glib2/pspec.xml
=================================================================
--- corporate2/devel/system/base/glib2/pspec.xml	(original)
+++ corporate2/devel/system/base/glib2/pspec.xml	Wed Dec  8 13:57:26 2010
@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>A library of handy utility functions</Summary>
         <Description>glib2 is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, dynamic loading, and an object system.</Description>
-        <Archive sha1sum="882350c31af929cd4e78ee6aad46108748240e78" type="tarbz2">mirrors://gnome/glib/2.24/glib-2.24.2.tar.bz2</Archive>
+        <Archive sha1sum="8d35d5cf41d681dd6480a16be39f7d3cffbd29f0" type="tarbz2">mirrors://gnome/glib/2.26/glib-2.26.1.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>libpcre-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
@@ -21,10 +21,10 @@
             <!-- Don't fail check when run as root -->
             <Patch>glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch</Patch>
 
-            <!-- This fails because we don't have update-desktop-database -->
-            <Patch level="1">glib-2.20.5-drop-gio-desktop-app-info-test.patch</Patch>
-
             <Patch level="1">fix-broken-gthread-pkgconfig.patch</Patch>
+
+            <!-- Fix for assert test failure https://bugzilla.gnome.org/show_bug.cgi?id=621368 -->
+            <Patch>glib-2.24-assert-test-failure.patch</Patch>
         </Patches>
     </Source>
 
@@ -35,20 +35,76 @@
             <Dependency>zlib</Dependency>
         </RuntimeDependencies>
         <Files>
+            <Path fileType="executable">/etc/bash_completion.d</Path>
+            <Path fileType="executable">/etc/profile.d</Path>
             <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="header">/usr/include</Path>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="localedata">/usr/share/locale</Path>
             <Path fileType="man">/usr/share/man</Path>
             <Path fileType="doc">/usr/share/doc</Path>
-            <Path fileType="data">/usr/share/gdb</Path>
-            <Path fileType="data">/usr/share/aclocal</Path>
-            <Path fileType="data">/usr/lib/pkgconfig</Path>
             <Path fileType="data">/usr/share/glib-2.0</Path>
+            <Path fileType="data">/usr/share/glib-2.0/schemas</Path>
+        </Files>
+        <AdditionalFiles>
+            <AdditionalFile owner="root" permission="0644" target="/etc/profile.d/glib2.sh">glib2.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/etc/profile.d/glib2.csh">glib2.csh</AdditionalFile>
+        </AdditionalFiles>
+        <Provides>
+            <COMAR script="pakhandler.py">System.PackageHandler</COMAR>
+        </Provides>
+    </Package>
+
+    <Package>
+        <Name>glib2-devel</Name>
+        <PartOf>system.devel</PartOf>
+        <Summary>Development files for glib2</Summary>
+        <RuntimeDependencies>
+            <Dependency release="current">glib2</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="executable">/usr/bin/gtester</Path>
+            <Path fileType="executable">/usr/bin/gtester-report</Path>
+            <Path fileType="executable">/usr/bin/gobject-query</Path>
+            <Path fileType="executable">/usr/bin/glib-genmarshal</Path>
+            <Path fileType="executable">/usr/bin/glib-gettextize</Path>
+            <Path fileType="executable">/usr/bin/glib-mkenums</Path>
+            <Path fileType="header">/usr/include</Path>
+            <Path fileType="header">/usr/lib/glib-2.0/include</Path>
+            <Path fileType="data">/usr/lib/pkgconfig</Path>
+            <Path fileType="data">/usr/share/aclocal</Path>
+            <Path fileType="data">/usr/share/glib-2.0/schemas/gschema.dtd</Path>
+            <Path fileType="data">/usr/share/glib-2.0/gettext</Path>
+            <Path fileType="data">/usr/share/glib-2.0/gdb</Path>
+            <Path fileType="data">/usr/share/gdb/auto-load/libglib-2.0.so.*-gdb.py*</Path>
+            <Path fileType="data">/usr/share/gdb/auto-load/libgobject-2.0.so.*-gdb.py*</Path>
+            <Path fileType="man">/usr/share/man/man3</Path>
+            <Path fileType="man">/usr/share/man/man1/glib-genmarshal.1</Path>
+            <Path fileType="man">/usr/share/man/man1/glib-gettextize.1</Path>
+            <Path fileType="man">/usr/share/man/man1/glib-mkenums.1</Path>
+            <Path fileType="man">/usr/share/man/man1/gobject-query.1</Path>
+            <Path fileType="man">/usr/share/man/man1/gtester-report.1</Path>
+            <Path fileType="man">/usr/share/man/man1/gtester.1</Path>
         </Files>
     </Package>
 
     <History>
+        <Update release="47">
+            <Date>2010-11-30</Date>
+            <Version>2.26.1</Version>
+            <Comment>Version b</Comment>
+            <Name>Ozan Çağlayan</Name>
+            <Email>ozan at pardus.org.tr</Email>
+        </Update>
+        <Update release="46">
+            <Date>2010-11-30</Date>
+            <Version>2.26.1</Version>
+            <Comment>
+                - Version bump to 2.26.1
+                - Merge Burak's changes from 2011.
+             </Comment>
+            <Name>Ozan Çağlayan</Name>
+            <Email>ozan at pardus.org.tr</Email>
+        </Update>
         <Update release="45">
             <Date>2010-10-26</Date>
             <Version>2.24.2</Version>


More information about the paketler-commits mailing list