From 912027f0df88dc54999144a493208aec01ea9905 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 19 Jan 2007 15:50:30 +0000 Subject: [PATCH] Some file list updates (#398069, Owen Taylor) 2007-01-19 Matthias Clasen Some file list updates (#398069, Owen Taylor) * docs/Changes-2.0.txt * docs/reference/README.cvs-commits * glib.spec.in: Remove obsolete files * tests/Makefile.am: * glib/libcharset/Makefile.am: * gobject/Makefile.am: * Makefile.am: Add some missing files to EXTRA_DIST * tests/timeloop-basic.c: Make it build * HACKING: Small updates svn path=/trunk/; revision=5302 --- ChangeLog | 16 ++++++ HACKING | 7 +-- Makefile.am | 5 ++ docs/Changes-2.0.txt | 47 ---------------- docs/reference/README.cvs-commits | 39 -------------- glib.spec.in | 111 -------------------------------------- glib/libcharset/Makefile.am | 3 +- gobject/Makefile.am | 3 +- tests/Makefile.am | 3 +- tests/timeloop-basic.c | 8 +-- 10 files changed, 35 insertions(+), 207 deletions(-) delete mode 100644 docs/Changes-2.0.txt delete mode 100644 docs/reference/README.cvs-commits delete mode 100644 glib.spec.in diff --git a/ChangeLog b/ChangeLog index c5575b6..93e5452 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2007-01-19 Matthias Clasen + + Some file list updates (#398069, Owen Taylor) + + * docs/Changes-2.0.txt + * docs/reference/README.cvs-commits + * glib.spec.in: Remove obsolete files + + * tests/Makefile.am: + * glib/libcharset/Makefile.am: + * gobject/Makefile.am: + * Makefile.am: Add some missing files to EXTRA_DIST + + * tests/timeloop-basic.c: Make it build + * HACKING: Small updates + 2007-01-18 Matthias Clasen * glib/gdate.c (g_date_set_time): Fix a typo. (#398203, diff --git a/HACKING b/HACKING index 957dbcc..b1ba9f2 100644 --- a/HACKING +++ b/HACKING @@ -1,10 +1,11 @@ If you want to hack on the GLib project, you'll need to have the following packages installed: - - GNU autoconf 2.52 - - GNU automake 1.4 - - GNU libtool 1.4 + - GNU autoconf 2.54 + - GNU automake 1.7 + - GNU libtool 1.4 - GNU gettext 0.10.40 + - gtk-doc These should be available by ftp from ftp.gnu.org or any of the fine GNU mirrors. Beta software can be found at alpha.gnu.org. diff --git a/Makefile.am b/Makefile.am index 7cb9602..408dce4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,6 +10,8 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION EXTRA_DIST = \ + ChangeLog.pre-2-12 \ + ChangeLog.pre-2-10 \ ChangeLog.pre-2-8 \ ChangeLog.pre-2-6 \ ChangeLog.pre-2-4 \ @@ -23,6 +25,9 @@ EXTRA_DIST = \ README.in \ INSTALL.in \ README.win32 \ + HACKING \ + MAINTAINERS \ + autogen.sh \ makefile.msc \ glibconfig.h.win32.in \ msvc_recommended_pragmas.h \ diff --git a/docs/Changes-2.0.txt b/docs/Changes-2.0.txt deleted file mode 100644 index e670ea4..0000000 --- a/docs/Changes-2.0.txt +++ /dev/null @@ -1,47 +0,0 @@ -* The event loop functionality GMain has extensively been revised to - support multiple separate main loops in separate threads. All sources - (timeouts, idle functions, etc.) are associated with a GMainContext. - - Compatibility functions exist so that most application code dealing with - the main loop will continue to work. However, code that creates - new custom types of sources will require modification. - - The main changes here are: - - - Sources are now exposed as GSource *, rather than simply as numeric - IDS. - - - New types of sources are created by structure "derivation" from GSource, - so the source_data parameter to the GSource vfuncs has been - replaced with a GSource *. - - - Sources are first created, then later added to a specific GMainContext - - - Dispatching has been modified so both the callback and data are passed - in to the ->dispatch() vfunc. - - To go along with this change, the vtable for GIOChannel has changed and - add_watch() has been replaced by create_watch(). - -* g_list_foreach() and g_slist_foreach() have been changed so they - are now safe against removal of the current item, not the next item. - - It's not recommended to mutate the list in the callback to these - functions in any case. - -* GDate now works in UTF-8, not in the current locale. If you - want to use it with the encoding of the locale, you need - to convert strings using g_locale_to_utf8 first. - -* g_strsplit() has been fixed to: - - - include trailing empty tokens, rather than stripping them - - split into a maximum of @max_tokens tokens, rather than - @max_tokens + 1 - - Code depending on either of these bugs will need to be fixed. - -* deprecated functions that got removed: - g_set_error_handler(), g_set_warning_handler(), - g_set_message_handler(), use g_log_set_handler() instead. - diff --git a/docs/reference/README.cvs-commits b/docs/reference/README.cvs-commits deleted file mode 100644 index 98d321e..0000000 --- a/docs/reference/README.cvs-commits +++ /dev/null @@ -1,39 +0,0 @@ -Before making any changes to this module, please -contact: - - Damon Chaplin - -This will ensure that duplicate work does not occur, -and also make sure we know who has written what -parts of the documentation. See - - http://www.gtk.org/rdp/ - -for more information. - -By contributing work to the Reference Documentation -Project, you agree that it will be covered under the -license terms described in the file COPYING -included in this directory. - - -Other notes: - -- Do not run 'make templates' unless you have - the latest cvs version of the glib-1-2 - version of GLib and the latest CVS version - of gtk-doc. - - (This is very important. Otherwise, the template - files may be come corrupted.) - - Make sure that glib-config --prefix points - to the correct version of GLib. - -- As always, ChangeLog entries should be made for - each commit. These can be really brief - "documented GHashTable"; but if you are editing - something someone else wrote, please be specific. - (Or better, send the changes to them for their - approval, first) - diff --git a/glib.spec.in b/glib.spec.in deleted file mode 100644 index 8e78f7a..0000000 --- a/glib.spec.in +++ /dev/null @@ -1,111 +0,0 @@ -Name: glib2 -Summary: Handy library of utility functions -Version: @VERSION@ -Release: 1 -License: LGPL -Group: Development/Libraries -Source: ftp://ftp.gimp.org/pub/gtk/v2.0/glib-%{version}.tar.gz -BuildRoot: /var/tmp/%{name}-%{version}-root -URL: http://www.gtk.org - -%description -Handy library of utility functions. Development libs and headers -are in glib-devel. - -%package devel -Summary: GIMP Toolkit and GIMP Drawing Kit support library -Group: Development/Libraries -Requires: %{name} = %{version} - -%description devel -Static libraries and header files for the support library for the GIMP's X -libraries, which are available as public libraries. GLIB includes generally -useful data structures. - -%prep -%setup -q -n glib-%{version} - -%build -CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=%{_prefix} \ - --bindir=%{_bindir} --mandir=%{_mandir} \ - --localstatedir=%{_localstatedir} --libdir=%{_libdir} \ - --datadir=%{_datadir} --includedir=%{_includedir} \ - --sysconfdir=%{_sysconfdir} --disable-gtk-doc -make - -%install -rm -rf $RPM_BUILD_ROOT - -make prefix=$RPM_BUILD_ROOT%{_prefix} bindir=$RPM_BUILD_ROOT%{_bindir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} libdir=$RPM_BUILD_ROOT%{_libdir} \ - localstatedir=$RPM_BUILD_ROOT%{_localstatedir} \ - datadir=$RPM_BUILD_ROOT%{_datadir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} install - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-, root, root) - -%doc AUTHORS COPYING ChangeLog NEWS README -%{_libdir}/lib*.so.* - -%files devel -%defattr(-, root, root) - -%{_libdir}/lib*.so -%{_libdir}/*a -%{_libdir}/glib-2.0 -%{_libdir}/pkgconfig/*.pc -%{_includedir}/glib-2.0 -%{_mandir}/man1/glib-* -%{_datadir}/aclocal/* -%{_bindir}/* -#%{_datadir}/gtk-doc/html/glib-2.0 -#%{_datadir}/gtk-doc/html/gobject - -%changelog -* Mon Aug 27 2001 Jens Finke -- Changed package name to glib2. -- Updated source URL. - -* Mon Aug 14 2001 Jens Finke -- Updated to match gpp standard: - - removed all hardcoded paths, use rpm macros instead - - changed Copyright to License - - removed explicit docdir definition - - added 'Requires' to devel package - - added paths to 'configure' and 'make' calls - - moved %changelog section to the end of the file - - updated files section to match changes in glib-2.0 - -* Tue Jun 1 1999 Jose Mercado -- fixed version numbers in files section. - -* Thu Feb 11 1999 Michael Fulbright -- added libgthread to file list - -* Fri Feb 05 1999 Michael Fulbright -- version 1.1.15 - -* Wed Feb 03 1999 Michael Fulbright -- version 1.1.14 - -* Mon Jan 18 1999 Michael Fulbright -- version 1.1.13 - -* Wed Jan 06 1999 Michael Fulbright -- version 1.1.12 - -* Wed Dec 16 1998 Michael Fulbright -- updated in preparation for the GNOME freeze - -* Mon Apr 13 1998 Marc Ewing -- Split out glib package diff --git a/glib/libcharset/Makefile.am b/glib/libcharset/Makefile.am index 0cfc471..c019457 100644 --- a/glib/libcharset/Makefile.am +++ b/glib/libcharset/Makefile.am @@ -17,7 +17,8 @@ EXTRA_DIST = \ glibc21.m4 \ codeset.m4 \ update.sh \ - make-patch.sh + make-patch.sh \ + libcharset-glib.patch charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 66f1ebd..6721ed5 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -145,7 +145,8 @@ EXTRA_HEADERS = EXTRA_DIST = \ $(gobject_private_h_sources) \ $(gobject_extra_sources) \ - makegobjectalias.pl + makegobjectalias.pl \ + marshal-genstrings.pl # # rules to generate built sources diff --git a/tests/Makefile.am b/tests/Makefile.am index b8f9823..ec438d4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -33,7 +33,8 @@ EXTRA_DIST = \ gen-casefold-txt.pl \ gen-casemap-txt.pl \ iochannel-test-infile \ - utf8.txt + utf8.txt \ + timeloop-basic.c BUILT_EXTRA_DIST = \ makefile.msc diff --git a/tests/timeloop-basic.c b/tests/timeloop-basic.c index 6ca291d..56861f3 100644 --- a/tests/timeloop-basic.c +++ b/tests/timeloop-basic.c @@ -33,8 +33,8 @@ my_pipe (int *fds) int read_all (int fd, char *buf, int len) { - gsize bytes_read = 0; - gssize count; + size_t bytes_read = 0; + ssize_t count; while (bytes_read < len) { @@ -56,8 +56,8 @@ read_all (int fd, char *buf, int len) int write_all (int fd, char *buf, int len) { - gsize bytes_written = 0; - gssize count; + size_t bytes_written = 0; + ssize_t count; while (bytes_written < len) { -- 2.7.4