Hello community, here is the log from the commit of package gparted for openSUSE:Factory checked in at 2013-05-06 10:09:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gparted (Old) and /work/SRC/openSUSE:Factory/.gparted.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gparted" Changes: -------- --- /work/SRC/openSUSE:Factory/gparted/gparted.changes 2013-04-26 12:37:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gparted.new/gparted.changes 2013-05-06 10:09:47.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 1 20:59:12 UTC 2013 - [email protected] + +- Update to version 0.16.1: + + Avoid another crash in GParted when moving or copying + partitions (bgo#697727). + + Fix GParted doesn't compile on RHEL / CentOS 5.9 (bgo#695279). + + Recognise HFSX variant as an HFS+ file system (bgo#698876). + +------------------------------------------------------------------- Old: ---- gparted-0.16.0.tar.bz2 New: ---- gparted-0.16.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gparted.spec ++++++ --- /var/tmp/diff_new_pack.gvA26w/_old 2013-05-06 10:09:48.000000000 +0200 +++ /var/tmp/diff_new_pack.gvA26w/_new 2013-05-06 10:09:48.000000000 +0200 @@ -17,13 +17,13 @@ Name: gparted -Version: 0.16.0 +Version: 0.16.1 Release: 0 Summary: Gnome Partition Editor License: GPL-2.0 Group: System/Filesystems Url: http://gparted.sourceforge.net/ -Source0: http://downloads.sourceforge.net/project/gparted/gparted/gparted-0.16.0/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/project/gparted/gparted/gparted-0.16.1/%{name}-%{version}.tar.bz2 Source1: gparted.policy BuildRequires: e2fsprogs-devel BuildRequires: fdupes ++++++ gparted-0.16.0.tar.bz2 -> gparted-0.16.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/ChangeLog new/gparted-0.16.1/ChangeLog --- old/gparted-0.16.0/ChangeLog 2013-04-24 17:15:51.000000000 +0200 +++ new/gparted-0.16.1/ChangeLog 2013-04-30 17:19:37.000000000 +0200 @@ -1,5 +1,157 @@ # Generated by Makefile. Do not edit. +2013-04-30 Curtis Gedak <[email protected]> + + ========== gparted-0.16.1 ========== + +2013-04-29 Mike Fleetwood <[email protected]> + + Fix autoconf check for set_default_icon_name method (#695279) + + The autoconf check for the Gtk::Window::set_default_icon_name() method + was failing to detect its availability, but only on Ubuntu >= 11.10. + + Turns out that the autoconf check incorrectly defined the link libraries + via the C++ flags variable CXXFLAGS, rather than the LIBS variable. + This resulted in the libraries being specified in the wrong order on the + command line. The test only failed when Ubuntu also added the + "--as-needed" flag to the linker by default [1] which required the + libraries to be correctly specified at the end of the command line. + + [1] Ubuntu 11.10 Release Notes, GCC 4.6 Toolchain + https://wiki.ubuntu.com/OneiricOcelot/ReleaseNotes#GCC_4.6_Toolchain + + This fixes commit: + + a04210788399736ff7f097cb75650ebcbd0a4950 + Only use Gtk::Window::set_default_icon_name method when available + + Bug #695279 - GParted doesn't compile on RHEL / CentOS 5.9 + +2013-04-25 Phillip Susi <[email protected]> + + Avoid glibmm GSource bug/crash (again) (#697727) + + The previous commit missed one glibmm GSource wrapper in the form of the + io watch for the PipeCapture class. Convert this one to use glib + directly as well. + + Bug #697727 - Segfault in livecd Gparted v 0.15.0-3 when copying + partition + +2013-04-27 Mike Fleetwood <[email protected]> + + Add copyright notice to PipeCapture .cc and .h files + +2013-04-28 Mike Fleetwood <[email protected]> + + Only install fallback icon when required (#695279) + + Applications are moving away from storing icons in /usr/share/pixmaps, + instead preferring /usr/share/icons/hicolor/$SIZE/apps, so only install + the fallback icon when GParted requires it. + + Bug #695279 - GParted doesn't compile on RHEL / CentOS 5.9 + +2013-04-24 Mike Fleetwood <[email protected]> + + Add fallback method for specifying GParted icon (#695279) + + On RHEL / CentOS 5.9 GParted couldn't set an icon as the + set_default_icon_name() method is not available. See commit [1] for + details. + + Re-add the old set_icon_from_file() method as a fallback and re-install + a GParted pixmap as was used before commit [2]. + + Commit [1]: + a04210788399736ff7f097cb75650ebcbd0a4950 + Only use Gtk::Window::set_default_icon_name method when available + + Commit [2]: + f5a80bc9048ffa859aab40de27d96a5dd1d7f65b + Enabled GParted to use themed app icon (Tango theme) + + Bug #695279 - GParted doesn't compile on RHEL / CentOS 5.9 + +2013-04-18 Mike Fleetwood <[email protected]> + + Work around failure to execute commands with old glibmm (#695279) + + On RHEL / CentOS 5.9 GParted failed to run any external commands and + instead reported the following warnings to the terminal: + + # src/gpartedbin + ====================== + libparted : 1.8.1 + ====================== + Failed to change to directory '' (No such file or directory) + Failed to change to directory '' (No such file or directory) + Failed to change to directory '' (No such file or directory) + ... + + Utils::execute_command() and FileSystem::execute_command() passed a zero + length string for the working directory to + Glib::spawn_async_with_pipes() to mean don't change directory. Instead + glibmm just tried to change to the directory with a zero length name. + This was fixed with glibmm >= 2.21.2 released July 2009, however RHEL / + CentOS 5.9 only has glibmm 2.12.10. + + Relevant glibmm fix: + Treat empty Glib::spawn*() working dir as unset + https://git.gnome.org/browse/glibmm/commit/?id=8a7805cbbe6d268e975669349beb4e82d971537d + + Fix by simply specifying ".", the current working directory, as the + directory to change into before executing all commands. + + Bug #695279 - GParted doesn't compile on RHEL / CentOS 5.9 + +2013-04-14 Mike Fleetwood <[email protected]> + + Further RHEL / CentOS 5.9 compile fixes (#695279) + + Glib::ustring::compose() method requires glibmm >= 2.16, but RHEL / + CentOS 5.9 only provides glibmm 2.12. Replace with String::ucompose() + as is used everywhere else in the code. + + Add missing include for kill() and SIGINT declarations. + + Bug #695279 - GParted doesn't compile on RHEL / CentOS 5.9 + +2013-04-25 Mike Fleetwood <[email protected]> + + Recognise HFSX variant as an HFS+ file system (#698876) + + Roughly HFSX is a case sensitive version of the HFS+ file system. + + Parted reports such a file system as "hfsx" rather than "hfs+". + + # mkfs.hfsplus -v "case insensitive hfs+" /dev/sda7 + Initialized /dev/sda7 as a 1024 MB HFS Plus volume + + # mkfs.hfsplus -s -v "case sensitive hfs+" /dev/sda8 + Initialized /dev/sda8 as a 1024 MB HFS Plus volume + + # parted /dev/sda print + ... + Number Start End Size Type File system Flags + ... + 7 356GB 357GB 1074MB logical hfs+ + 8 357GB 358GB 1074MB logical hfsx + + # blkid /dev/sda[78] + /dev/sda7: LABEL="case insensitive hfs+" TYPE="hfsplus" + /dev/sda8: LABEL="case sensitive hfs+" TYPE="hfsplus" + + Make GParted recognise HFSX file system variants too. + + Closes Bug #698876 - GParted fails to recognize HFS+ partition (possible + due to disabled journaling) + +2013-04-24 Curtis Gedak <[email protected]> + + Append -git to version for continuing development + 2013-04-24 Curtis Gedak <[email protected]> ========== gparted-0.16.0 ========== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/NEWS new/gparted-0.16.1/NEWS --- old/gparted-0.16.0/NEWS 2013-04-24 17:07:01.000000000 +0200 +++ new/gparted-0.16.1/NEWS 2013-04-30 17:06:13.000000000 +0200 @@ -1,4 +1,40 @@ ============================ +GParted 0.16.1 (2013-04-30) +============================ + +Release Notes +------------- + This release of GParted includes another critical bug fix for a + potential crash that might cause loss of data while moving or + copying a partition. We strongly recommend that all users of + GParted 0.15.0 and 0.16.0 upgrade to GParted 0.16.1 to avoid data + loss. + +### Key changes include: + + * Avoid another crash in GParted when moving or copying partitions + * Fix GParted doesn't compile on RHEL / CentOS 5.9 + +Bug Fixes +--------- + * Avoid another crash in GParted when moving or copying partitions (#697727) + * Fix GParted doesn't compile on RHEL / CentOS 5.9 (#695279) + * Recognise HFSX variant as an HFS+ file system (#698876) + +Code Credits +------------ + Code enhancements are courtesy of Phillip Susi and Mike Fleetwood. + +Translations (new/updated) +-------------------------- + None. + +Dependencies (new/updated) +-------------------------- + * no change. + + +============================ GParted 0.16.0 (2013-04-24) ============================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/configure new/gparted-0.16.1/configure --- old/gparted-0.16.0/configure 2013-04-24 17:15:40.000000000 +0200 +++ new/gparted-0.16.1/configure 2013-04-30 17:19:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gparted 0.16.0. +# Generated by GNU Autoconf 2.68 for gparted 0.16.1. # # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gparted>. # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='gparted' PACKAGE_TARNAME='gparted' -PACKAGE_VERSION='0.16.0' -PACKAGE_STRING='gparted 0.16.0' +PACKAGE_VERSION='0.16.1' +PACKAGE_STRING='gparted 0.16.1' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gparted' PACKAGE_URL='' @@ -627,6 +627,8 @@ DOC_USER_FORMATS OMF_DIR HELP_DIR +INSTALL_PIXMAPS_DIR_FALSE +INSTALL_PIXMAPS_DIR_TRUE GTKMM_LIBS GTKMM_CFLAGS GTHREAD_LIBS @@ -1386,7 +1388,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gparted 0.16.0 to adapt to many kinds of systems. +\`configure' configures gparted 0.16.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1456,7 +1458,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gparted 0.16.0:";; + short | recursive ) echo "Configuration of gparted 0.16.1:";; esac cat <<\_ACEOF @@ -1582,7 +1584,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gparted configure 0.16.0 +gparted configure 0.16.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2072,7 +2074,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gparted $as_me 0.16.0, which was +It was created by gparted $as_me 0.16.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2894,7 +2896,7 @@ # Define the identity of the package. PACKAGE='gparted' - VERSION='0.16.0' + VERSION='0.16.1' cat >>confdefs.h <<_ACEOF @@ -17206,7 +17208,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS_save="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS `pkg-config gtkmm-2.4 --cflags --libs`" +CXXFLAGS="$CXXFLAGS `pkg-config gtkmm-2.4 --cflags`" +LIBS_save="$LIBS" +LIBS="`pkg-config gtkmm-2.4 --libs`" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gtk::Window::set_default_icon_name method" >&5 $as_echo_n "checking for Gtk::Window::set_default_icon_name method... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17227,17 +17231,35 @@ $as_echo "#define HAVE_SET_DEFAULT_ICON_NAME 1" >>confdefs.h + if false; then + INSTALL_PIXMAPS_DIR_TRUE= + INSTALL_PIXMAPS_DIR_FALSE='#' +else + INSTALL_PIXMAPS_DIR_TRUE='#' + INSTALL_PIXMAPS_DIR_FALSE= +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + if true; then + INSTALL_PIXMAPS_DIR_TRUE= + INSTALL_PIXMAPS_DIR_FALSE='#' +else + INSTALL_PIXMAPS_DIR_TRUE='#' + INSTALL_PIXMAPS_DIR_FALSE= +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$CXXFLAGS_save" +LIBS="$LIBS_save" ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -17679,6 +17701,14 @@ as_fn_error $? "conditional \"USE_LIBPARTED_FS_RESIZE_LIBRARY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${INSTALL_PIXMAPS_DIR_TRUE}" && test -z "${INSTALL_PIXMAPS_DIR_FALSE}"; then + as_fn_error $? "conditional \"INSTALL_PIXMAPS_DIR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${INSTALL_PIXMAPS_DIR_TRUE}" && test -z "${INSTALL_PIXMAPS_DIR_FALSE}"; then + as_fn_error $? "conditional \"INSTALL_PIXMAPS_DIR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then as_fn_error $? "conditional \"ENABLE_SK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18108,7 +18138,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gparted $as_me 0.16.0, which was +This file was extended by gparted $as_me 0.16.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18174,7 +18204,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gparted config.status 0.16.0 +gparted config.status 0.16.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/configure.ac new/gparted-0.16.1/configure.ac --- old/gparted-0.16.0/configure.ac 2013-04-24 17:08:14.000000000 +0200 +++ new/gparted-0.16.1/configure.ac 2013-04-30 17:13:41.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([gparted],[0.16.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=gparted]) +AC_INIT([gparted],[0.16.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gparted]) AC_PREREQ([2.50]) AC_CONFIG_SRCDIR([src/main.cc]) @@ -297,7 +297,9 @@ dnl and link a test program check. AC_LANG_PUSH([C++]) CXXFLAGS_save="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS `pkg-config gtkmm-2.4 --cflags --libs`" +CXXFLAGS="$CXXFLAGS `pkg-config gtkmm-2.4 --cflags`" +LIBS_save="$LIBS" +LIBS="`pkg-config gtkmm-2.4 --libs`" AC_MSG_CHECKING([for Gtk::Window::set_default_icon_name method]) AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -308,11 +310,15 @@ )], [AC_DEFINE([HAVE_SET_DEFAULT_ICON_NAME], 1, [Define to 1 if gtkmm-2.4 provides Gtk::Window::set_default_icon_name() method.]) + AM_CONDITIONAL([INSTALL_PIXMAPS_DIR], false) AC_MSG_RESULT([yes]) ], - [AC_MSG_RESULT([no])] + [AM_CONDITIONAL([INSTALL_PIXMAPS_DIR], true) + AC_MSG_RESULT([no]) + ] ) CXXFLAGS="$CXXFLAGS_save" +LIBS="$LIBS_save" AC_LANG_POP([C++]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/data/icons/Makefile.am new/gparted-0.16.1/data/icons/Makefile.am --- old/gparted-0.16.0/data/icons/Makefile.am 2010-05-28 23:18:25.000000000 +0200 +++ new/gparted-0.16.1/data/icons/Makefile.am 2013-04-28 23:29:39.000000000 +0200 @@ -16,15 +16,32 @@ private_icons = \ $(NULL) +# Name of the fallback icon to install in /usr/share/pixmaps [1] +# -- +# The GNOME 2 desktop wants a 16x16 "Menu" type icon [2] for the title +# bar and the open window list, and a 32x32 icon for the Alt-Tab task +# switcher. GParted only specifies a single icon file in the fallback +# case so just use the 16x16 one and let it be scaled as required. +# [1] https://developer.gnome.org/icon-theme-spec/ +# [2] https://developer.gnome.org/hig-book/2.32/hig-book.html#icons +pixmap = hicolor_apps_16x16_gparted.png + noinst_DATA = \ $(NULL) EXTRA_DIST = \ $(public_icons) \ $(private_icons) \ + $(pixmap) \ $(noinst_DATA) \ $(NULL) +# Only install fallback icon to /usr/share/pixmaps if required +if INSTALL_PIXMAPS_DIR +INSTALL_PIXMAP = install-pixmap +UNINSTALL_PIXMAP = uninstall-pixmap +endif + ############################################################################### gtk_update_icon_cache = gtk-update-icon-cache -f -t @@ -76,6 +93,13 @@ rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done -install-data-local: install-icons update-icon-cache +install-pixmap: + mkdir -p $(DESTDIR)$(datadir)/pixmaps; \ + $(INSTALL_DATA) $(srcdir)/$(pixmap) $(DESTDIR)$(datadir)/pixmaps/gparted.png + +uninstall-pixmap: + rm -f $(DESTDIR)$(datadir)/pixmaps/gparted.png + +install-data-local: install-icons $(INSTALL_PIXMAP) update-icon-cache -uninstall-local: uninstall-icons update-icon-cache +uninstall-local: uninstall-icons $(UNINSTALL_PIXMAP) update-icon-cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/data/icons/Makefile.in new/gparted-0.16.1/data/icons/Makefile.in --- old/gparted-0.16.0/data/icons/Makefile.in 2013-04-24 17:15:40.000000000 +0200 +++ new/gparted-0.16.1/data/icons/Makefile.in 2013-04-30 17:19:23.000000000 +0200 @@ -230,16 +230,31 @@ private_icons = \ $(NULL) + +# Name of the fallback icon to install in /usr/share/pixmaps [1] +# -- +# The GNOME 2 desktop wants a 16x16 "Menu" type icon [2] for the title +# bar and the open window list, and a 32x32 icon for the Alt-Tab task +# switcher. GParted only specifies a single icon file in the fallback +# case so just use the 16x16 one and let it be scaled as required. +# [1] https://developer.gnome.org/icon-theme-spec/ +# [2] https://developer.gnome.org/hig-book/2.32/hig-book.html#icons +pixmap = hicolor_apps_16x16_gparted.png noinst_DATA = \ $(NULL) EXTRA_DIST = \ $(public_icons) \ $(private_icons) \ + $(pixmap) \ $(noinst_DATA) \ $(NULL) +# Only install fallback icon to /usr/share/pixmaps if required +@INSTALL_PIXMAPS_DIR_TRUE@INSTALL_PIXMAP = install-pixmap +@INSTALL_PIXMAPS_DIR_TRUE@UNINSTALL_PIXMAP = uninstall-pixmap + ############################################################################### gtk_update_icon_cache = gtk-update-icon-cache -f -t all: all-am @@ -480,9 +495,16 @@ rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done -install-data-local: install-icons update-icon-cache +install-pixmap: + mkdir -p $(DESTDIR)$(datadir)/pixmaps; \ + $(INSTALL_DATA) $(srcdir)/$(pixmap) $(DESTDIR)$(datadir)/pixmaps/gparted.png + +uninstall-pixmap: + rm -f $(DESTDIR)$(datadir)/pixmaps/gparted.png + +install-data-local: install-icons $(INSTALL_PIXMAP) update-icon-cache -uninstall-local: uninstall-icons update-icon-cache +uninstall-local: uninstall-icons $(UNINSTALL_PIXMAP) update-icon-cache # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/include/PipeCapture.h new/gparted-0.16.1/include/PipeCapture.h --- old/gparted-0.16.0/include/PipeCapture.h 2013-03-20 02:14:38.000000000 +0100 +++ new/gparted-0.16.1/include/PipeCapture.h 2013-04-29 20:53:28.000000000 +0200 @@ -1,3 +1,20 @@ +/* Copyright (C) 2013 Phillip Susi + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + #ifndef PIPECAPTURE_H #define PIPECAPTURE_H @@ -14,11 +31,14 @@ unsigned int backcount; unsigned int linelength; Glib::RefPtr<Glib::IOChannel> channel; - sigc::connection connection; + guint sourceid; bool OnReadable( Glib::IOCondition condition ); + static gboolean _OnReadable( GIOChannel *source, + GIOCondition condition, + gpointer data ); public: PipeCapture( int fd, Glib::ustring &buffer ); - void connect_signal( int fd ); + void connect_signal(); ~PipeCapture(); sigc::signal<void> eof; sigc::signal<void> update; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/src/Dialog_Progress.cc new/gparted-0.16.1/src/Dialog_Progress.cc --- old/gparted-0.16.0/src/Dialog_Progress.cc 2013-03-20 02:14:38.000000000 +0100 +++ new/gparted-0.16.1/src/Dialog_Progress.cc 2013-04-28 22:33:31.000000000 +0200 @@ -292,7 +292,7 @@ if (--cancel_countdown) { /*TO TRANSLATORS: looks like Force Cancel (5) * where the number represents a count down in seconds until the button is enabled */ - cancelbutton->set_label( Glib::ustring::compose( _("Force Cancel (%1)"), cancel_countdown ) ); + cancelbutton->set_label( String::ucompose( _("Force Cancel (%1)"), cancel_countdown ) ); } else { cancelbutton->set_label( _("Force Cancel") ); canceltimer.disconnect(); @@ -323,7 +323,7 @@ cancel_countdown = 5; /*TO TRANSLATORS: looks like Force Cancel (5) * where the number represents a count down in seconds until the button is enabled */ - cancelbutton->set_label( Glib::ustring::compose( _("Force Cancel (%1)"), cancel_countdown ) ); + cancelbutton->set_label( String::ucompose( _("Force Cancel (%1)"), cancel_countdown ) ); canceltimer = Glib::signal_timeout().connect( sigc::mem_fun(*this, &Dialog_Progress::cancel_timeout), 1000 ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/src/FileSystem.cc new/gparted-0.16.1/src/FileSystem.cc --- old/gparted-0.16.0/src/FileSystem.cc 2013-03-20 02:14:38.000000000 +0100 +++ new/gparted-0.16.1/src/FileSystem.cc 2013-04-29 20:53:28.000000000 +0200 @@ -22,6 +22,7 @@ #include <cerrno> #include <iostream> #include <gtkmm/main.h> +#include <signal.h> #include <fcntl.h> namespace GParted @@ -88,7 +89,7 @@ running = true; try { Glib::spawn_async_with_pipes( - std::string(), + std::string( "." ), Glib::shell_parse_argv( command ), Glib::SPAWN_DO_NOT_REAP_CHILD | Glib::SPAWN_SEARCH_PATH, sigc::ptr_fun(setup_child), @@ -123,8 +124,8 @@ errorcapture.update.connect( sigc::bind( sigc::ptr_fun( relay_update ), &(children[children.size() - 1]), &error ) ); - outputcapture.connect_signal( out ); - errorcapture.connect_signal( err ); + outputcapture.connect_signal(); + errorcapture.connect_signal(); operationdetail.get_last_child().signal_cancel.connect( sigc::bind( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/src/GParted_Core.cc new/gparted-0.16.1/src/GParted_Core.cc --- old/gparted-0.16.0/src/GParted_Core.cc 2013-04-19 19:08:41.000000000 +0200 +++ new/gparted-0.16.1/src/GParted_Core.cc 2013-04-28 22:33:31.000000000 +0200 @@ -1264,6 +1264,7 @@ else if ( fs_type == "hfs" ) return GParted::FS_HFS ; else if ( fs_type == "hfs+" || + fs_type == "hfsx" || fs_type == "hfsplus" ) return GParted::FS_HFSPLUS ; else if ( fs_type == "ufs" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/src/Makefile.am new/gparted-0.16.1/src/Makefile.am --- old/gparted-0.16.0/src/Makefile.am 2013-04-17 18:44:45.000000000 +0200 +++ new/gparted-0.16.1/src/Makefile.am 2013-04-28 23:29:34.000000000 +0200 @@ -2,6 +2,7 @@ $(GTHREAD_CFLAGS) \ $(GTKMM_CFLAGS) \ -DGPARTED_DATADIR=\""$(datadir)"\" \ + -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" AM_CFLAGS = -Wall diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/src/Makefile.in new/gparted-0.16.1/src/Makefile.in --- old/gparted-0.16.0/src/Makefile.in 2013-04-24 17:15:41.000000000 +0200 +++ new/gparted-0.16.1/src/Makefile.in 2013-04-30 17:19:24.000000000 +0200 @@ -268,6 +268,7 @@ $(GTHREAD_CFLAGS) \ $(GTKMM_CFLAGS) \ -DGPARTED_DATADIR=\""$(datadir)"\" \ + -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" AM_CFLAGS = -Wall diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/src/PipeCapture.cc new/gparted-0.16.1/src/PipeCapture.cc --- old/gparted-0.16.0/src/PipeCapture.cc 2013-03-20 02:14:38.000000000 +0100 +++ new/gparted-0.16.1/src/PipeCapture.cc 2013-04-29 20:53:28.000000000 +0200 @@ -1,24 +1,50 @@ +/* Copyright (C) 2013 Phillip Susi + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + #include "../include/PipeCapture.h" #include <iostream> namespace GParted { -PipeCapture::PipeCapture( int fd, Glib::ustring &string ) : buff( string ), backcount( 0 ), linelength( 0 ) +PipeCapture::PipeCapture( int fd, Glib::ustring &string ) : buff( string ), backcount( 0 ), linelength( 0 ), + sourceid( 0 ) { // tie fd to string // make channel channel = Glib::IOChannel::create_from_fd( fd ); } -void PipeCapture::connect_signal( int fd ) +void PipeCapture::connect_signal() { // connect handler to signal input/output - connection = Glib::signal_io().connect( - sigc::mem_fun( *this, &PipeCapture::OnReadable ), - fd, - Glib::IO_IN | Glib::IO_HUP | Glib::IO_ERR ); + sourceid = g_io_add_watch( channel->gobj(), + GIOCondition(G_IO_IN | G_IO_ERR | G_IO_HUP), + _OnReadable, + this ); } +gboolean PipeCapture::_OnReadable( GIOChannel *source, + GIOCondition condition, + gpointer data ) +{ + return static_cast<PipeCapture *>(data)->OnReadable( Glib::IOCondition(condition) ); +} + + bool PipeCapture::OnReadable( Glib::IOCondition condition ) { // read from pipe and store in buff @@ -54,14 +80,14 @@ if (status != Glib::IO_STATUS_EOF) std::cerr << "Pipe IOChannel read failed" << std::endl; // signal completion - connection.disconnect(); eof(); return false; } PipeCapture::~PipeCapture() { - connection.disconnect(); + if( sourceid > 0 ) + g_source_remove( sourceid ); } } // namespace GParted diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/src/Utils.cc new/gparted-0.16.1/src/Utils.cc --- old/gparted-0.16.0/src/Utils.cc 2013-04-17 21:50:14.000000000 +0200 +++ new/gparted-0.16.1/src/Utils.cc 2013-04-29 20:53:28.000000000 +0200 @@ -474,7 +474,7 @@ status.foreground = (Glib::Thread::self() == GParted_Core::mainthread); try { Glib::spawn_async_with_pipes( - std::string(), + std::string( "." ), Glib::shell_parse_argv( command ), Glib::SPAWN_DO_NOT_REAP_CHILD | Glib::SPAWN_SEARCH_PATH, use_C_locale ? sigc::ptr_fun( set_locale ) : sigc::slot< void >(), @@ -501,8 +501,8 @@ status, &utils_execute_command_status::execute_command_eof )); errorcapture.eof.connect( sigc::mem_fun( status, &utils_execute_command_status::execute_command_eof )); - outputcapture.connect_signal( out ); - errorcapture.connect_signal( err ); + outputcapture.connect_signal(); + errorcapture.connect_signal(); if( status.foreground) Gtk::Main::run(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gparted-0.16.0/src/Win_GParted.cc new/gparted-0.16.1/src/Win_GParted.cc --- old/gparted-0.16.0/src/Win_GParted.cc 2013-04-17 18:44:45.000000000 +0200 +++ new/gparted-0.16.1/src/Win_GParted.cc 2013-04-28 22:33:31.000000000 +0200 @@ -75,16 +75,18 @@ this ->set_title( _("GParted") ); this ->set_default_size( 775, 500 ); -#ifdef HAVE_SET_DEFAULT_ICON_NAME try { +#ifdef HAVE_SET_DEFAULT_ICON_NAME this ->set_default_icon_name( "gparted" ) ; +#else + this ->set_icon_from_file( GNOME_ICONDIR "/gparted.png" ) ; +#endif } catch ( Glib::Exception & e ) { std::cout << e .what() << std::endl ; } -#endif //Pack the main box this ->add( vbox_main ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
