24400201 gparted needs to be updated to work with an updated libsigc++
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Fri, 05 Aug 2016 08:57:09 +0000
changeset 6582 4fb5be1315a8
parent 6581 dcfba1b5dd21
child 6583 d6703a724425
24400201 gparted needs to be updated to work with an updated libsigc++
components/gparted/Makefile
components/gparted/patches/2.gparted-01-solaris.patch
components/gparted/patches/3.gcc.patch
--- a/components/gparted/Makefile	Fri Aug 05 18:33:58 2016 +0000
+++ b/components/gparted/Makefile	Fri Aug 05 08:57:09 2016 +0000
@@ -24,6 +24,7 @@
 #
 BUILD_ARCH= i386
 BUILD_BITS= 32
+COMPILER= gcc
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		gparted
@@ -36,16 +37,27 @@
 TPNO=			27500
 
 TEST_TARGET= $(NO_TESTS)
+
+# Needs updated sigcpp, not available on S11.
+ifeq ($(BUILD_TYPE), evaluation)
+BUILD_32=
+INSTALL_32=
+PUBLISH_STAMP=
+endif
+
 include $(WS_MAKE_RULES)/common.mk
 
 COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv)
 
+CXXFLAGS += -std=c++11
+
 # needed to find xgettext
 PATH=$(GNUBIN):$(USRBINDIR)
 
 REQUIRED_PACKAGES += developer/gnome/gnome-doc-utils
 REQUIRED_PACKAGES += library/c++/glibmm
 REQUIRED_PACKAGES += library/c++/sigcpp
+REQUIRED_PACKAGES += library/desktop/c++/atkmm
 REQUIRED_PACKAGES += library/desktop/c++/cairomm
 REQUIRED_PACKAGES += library/desktop/c++/gtkmm
 REQUIRED_PACKAGES += library/desktop/c++/pangomm
@@ -54,6 +66,8 @@
 REQUIRED_PACKAGES += library/perl-5/xml-parser
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
 REQUIRED_PACKAGES += system/library/math
 ifneq ($(MACH), sparc)
 REQUIRED_PACKAGES += system/storage/parted
--- a/components/gparted/patches/2.gparted-01-solaris.patch	Fri Aug 05 18:33:58 2016 +0000
+++ b/components/gparted/patches/2.gparted-01-solaris.patch	Fri Aug 05 08:57:09 2016 +0000
@@ -47,33 +47,6 @@
  }
  
  void GParted_Core::add_node_and_mountpoint(
---- Original/Win_GParted.cc	2016-03-07 14:26:41.709974544 -0800
-+++ gparted-0.25.0/src/Win_GParted.cc	2016-03-07 14:47:13.296272589 -0800
[email protected]@ -2175,9 +2175,14 @@
- 
- 	*succes = true ; 
- 	for ( unsigned int t = 0 ; t < selected_partition_ptr->get_mountpoints().size() ; t++ )
--		if ( std::count( mountpoints.begin(),
-+	{
-+		size_t n = 0;
-+
-+		std::count( mountpoints.begin(),
- 		                 mountpoints.end(),
--		                 selected_partition_ptr->get_mountpoints()[t] ) <= 1 )
-+				 selected_partition_ptr->get_mountpoints()[t],
-+				 n );
-+		if ( n <= 1 )
- 		{
- 			Glib::ustring cmd = "umount -v \"" + selected_partition_ptr->get_mountpoints()[t] + "\"";
- 			if ( Utils::execute_command( cmd, dummy, *error ) )
[email protected]@ -2188,6 +2193,7 @@
- 		}
- 		else
- 			failed_mountpoints.push_back( selected_partition_ptr->get_mountpoints()[t] );
-+	}
- 
- 	if ( *succes && failed_mountpoints .size() )
- 	{
 --- Original/main.cc	2016-03-07 15:23:50.265705094 -0800
 +++ gparted-0.25.0/src/main.cc	2016-03-07 16:24:36.544239177 -0800
 @@ -20,8 +20,16 @@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gparted/patches/3.gcc.patch	Fri Aug 05 08:57:09 2016 +0000
@@ -0,0 +1,15 @@
+Changes for using g++
+
+Unsuitable for upstream
+
+--- gparted-0.25.0/include/Utils.h	2016-07-22 13:05:21.292028330 -0700
++++ gparted-0.25.0/include/Utils.h	2016-07-22 13:05:43.710025192 -0700
[email protected]@ -118,6 +118,8 @@
+ 	CTEXT_RESIZE_DISALLOWED_WARNING		// File system resizing currently disallowed reason
+ } ;
+ 
++#undef FS
++
+ //struct to store file system information
+ struct FS
+ {