Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PSARC/2016/501 EOF and Removal of GParted in S12
authorjulian.yuen@oracle.com <julian.yuen@oracle.com>
Tue, 13 Sep 2016 17:39:13 -0700
changeset 6902 f851e05a0783
parent 6901 2c7a24ff439f
child 6903 9681a8af4330
PSARC/2016/501 EOF and Removal of GParted in S12 24356490 EOF GParted component in S12
components/gparted/Makefile file | annotate | diff | comparison | revisions
components/gparted/gparted.p5m file | annotate | diff | comparison | revisions
components/gparted/patches/1.Makefile_am.patch file | annotate | diff | comparison | revisions
components/gparted/patches/2.gparted-01-solaris.patch file | annotate | diff | comparison | revisions
components/gparted/patches/3.gcc.patch file | annotate | diff | comparison | revisions
components/meta-packages/history/history file | annotate | diff | comparison | revisions 
--- a/components/gparted/Makefile	Mon Sep 12 09:26:27 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-#
-BUILD_ARCH= i386
-BUILD_BITS= 32
-COMPILER= gcc
-include ../../make-rules/shared-macros.mk
-
-COMPONENT_NAME=		gparted
-COMPONENT_VERSION=	0.25.0
-COMPONENT_PROJECT_URL=	http://gparted.org/
-COMPONENT_ARCHIVE_HASH=	\
-    sha256:2d996d5f4921d49eae850a1824acb8ab1299b1ea9bbb9c607248cd6c8cdc94ae
-COMPONENT_ARCHIVE_URL=	http://prdownloads.sourceforge.net/gparted/$(COMPONENT_ARCHIVE)
-
-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
-REQUIRED_PACKAGES += library/desktop/gtk2
-REQUIRED_PACKAGES += library/glib2
-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
-endif
--- a/components/gparted/gparted.p5m	Mon Sep 12 09:26:27 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-#
-<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-set name=pkg.fmri \
-    value=pkg:/desktop/administration/gparted@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GNome GParted Editor tool"
-set name=com.oracle.info.description value="GNOME Partition Editor"
-set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
-    value="org.opensolaris.category.2008:System/Administration and Configuration"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=LSARC/2009/651
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/sbin/gparted
-file path=usr/sbin/gpartedbin
-file path=usr/share/appdata/gparted.appdata.xml
-file path=usr/share/applications/gparted.desktop
-file path=usr/share/gnome/help/gparted/C/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/C/gparted.xml
-file path=usr/share/gnome/help/gparted/cs/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/cs/gparted.xml
-file path=usr/share/gnome/help/gparted/de/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/de/gparted.xml
-file path=usr/share/gnome/help/gparted/el/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/el/gparted.xml
-file path=usr/share/gnome/help/gparted/es/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/es/gparted.xml
-file path=usr/share/gnome/help/gparted/fr/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/fr/gparted.xml
-link path=usr/share/gnome/help/gparted/gd/figures/gparted_window.png \
-    target=../../C/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/gd/gparted.xml
-file path=usr/share/gnome/help/gparted/it/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/it/gparted.xml
-file path=usr/share/gnome/help/gparted/pt_BR/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/pt_BR/gparted.xml
-file path=usr/share/gnome/help/gparted/ro/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/ro/gparted.xml
-file path=usr/share/gnome/help/gparted/ru/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/ru/gparted.xml
-link path=usr/share/gnome/help/gparted/sl/figures/gparted_window.png \
-    target=../../C/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/sl/gparted.xml
-file path=usr/share/gnome/help/gparted/sr/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/sr/gparted.xml
-file path=usr/share/gnome/help/gparted/sr@latin/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/sr@latin/gparted.xml
-file path=usr/share/gnome/help/gparted/sv/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/sv/gparted.xml
-link path=usr/share/gnome/help/gparted/te/figures/gparted_window.png \
-    target=../../C/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/te/gparted.xml
-link path=usr/share/gnome/help/gparted/th/figures/gparted_window.png \
-    target=../../C/figures/gparted_window.png
-file path=usr/share/gnome/help/gparted/th/gparted.xml
-file path=usr/share/icons/hicolor/16x16/apps/gparted.png
-file path=usr/share/icons/hicolor/22x22/apps/gparted.png
-file path=usr/share/icons/hicolor/24x24/apps/gparted.png
-file path=usr/share/icons/hicolor/32x32/apps/gparted.png
-file path=usr/share/icons/hicolor/48x48/apps/gparted.png
-file path=usr/share/icons/hicolor/scalable/apps/gparted.svg
-file path=usr/share/locale/ar/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/bg/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/br/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/bs/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/ca/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/ca@valencia/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/cs/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/da/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/de/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/dz/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/el/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/en_CA/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/en_GB/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/eo/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/es/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/et/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/eu/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/fa/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/fi/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/fr/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/gd/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/gl/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/gu/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/he/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/hu/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/id/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/is/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/it/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/ja/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/kk/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/ko/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/lt/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/lv/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/mk/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/ml/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/nb/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/ne/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/nl/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/nn/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/oc/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/pa/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/pl/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/pt/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/pt_BR/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/ro/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/ru/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/rw/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/si/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/sk/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/sl/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/sr/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/sr@latin/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/sv/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/te/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/th/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/tr/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/uk/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/vi/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/zh_CN/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/zh_HK/LC_MESSAGES/gparted.mo
-file path=usr/share/locale/zh_TW/LC_MESSAGES/gparted.mo
-file path=usr/share/man/man8/gparted.8
-file path=usr/share/omf/gparted/gparted-C.omf
-file path=usr/share/omf/gparted/gparted-cs.omf
-file path=usr/share/omf/gparted/gparted-de.omf
-file path=usr/share/omf/gparted/gparted-el.omf
-file path=usr/share/omf/gparted/gparted-es.omf
-file path=usr/share/omf/gparted/gparted-fr.omf
-file path=usr/share/omf/gparted/gparted-gd.omf
-file path=usr/share/omf/gparted/gparted-it.omf
-file path=usr/share/omf/gparted/gparted-pt_BR.omf
-file path=usr/share/omf/gparted/gparted-ro.omf
-file path=usr/share/omf/gparted/gparted-ru.omf
-file path=usr/share/omf/gparted/gparted-sl.omf
-file path=usr/share/omf/gparted/gparted-sr.omf
-file path=usr/share/omf/gparted/[email protected]
-file path=usr/share/omf/gparted/gparted-sv.omf
-file path=usr/share/omf/gparted/gparted-te.omf
-file path=usr/share/omf/gparted/gparted-th.omf
-license COPYING license=GPLv2
--- a/components/gparted/patches/1.Makefile_am.patch	Mon Sep 12 09:26:27 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# Source: Internal
-# Info: Written internally- removing -Wall flags because Solaris Studio does not know of them  
-# Status: This patch is Solaris specific.  Will not be sent upstream.
-
---- ORIGINAL/src/Makefile.am	2016-01-12 08:43:52.928382761 -0800
-+++ gparted-0.25.0/src/Makefile.am	2016-01-12 08:46:21.389297831 -0800
-@@ -3,10 +3,6 @@
- 	-DGPARTED_DATADIR=\""$(datadir)"\"			\
- 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
- 
--AM_CFLAGS = -Wall	
--
--AM_CXXFLAGS = -Wall	
--
- sbin_PROGRAMS = gpartedbin
- 
- gpartedbin_SOURCES = \
--- a/components/gparted/patches/2.gparted-01-solaris.patch	Mon Sep 12 09:26:27 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-# Source: Internal
-# Info: This patch fixes issues introduced in updated version of GParted 0.25.0 
-# Status: This patch is Solaris specific.  Will not be sent upstream.
---- Original/GParted_Core.cc	2016-03-08 14:38:37.669910925 -0800
-+++ gparted-0.25.0/src/GParted_Core.cc	2016-03-08 14:39:22.709951526 -0800
-@@ -49,7 +49,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <dirent.h>
--#include <mntent.h>
-+#include <sys/mnttab.h>
- #include <gtkmm/messagedialog.h>
- #include <gtkmm/main.h>
- 
-@@ -1049,19 +1049,20 @@
- 	const Glib::ustring & filename,
- 	std::map< Glib::ustring, std::vector<Glib::ustring> > & map )
- {
-+	int i = 0;
- 	FS_Info fs_info ;  //Use cache of file system information
- 
--	FILE* fp = setmntent( filename .c_str(), "r" ) ;
-+	FILE* fp = fopen( filename .c_str(), "r" ) ;
- 
- 	if ( fp == NULL )
- 		return ;
- 
--	struct mntent* p = NULL ;
-+	struct mnttab* p = NULL ;
- 
--	while ( (p = getmntent(fp)) != NULL )
-+	while ( (i = getmntent(fp, p)) != NULL )
- 	{
--		Glib::ustring node = p->mnt_fsname ;
--		Glib::ustring mountpoint = p->mnt_dir ;
-+		Glib::ustring node = p->mnt_fstype ;
-+		Glib::ustring mountpoint = p->mnt_mountp ;
- 
- 		Glib::ustring uuid = Utils::regexp_label( node, "^UUID=(.*)" ) ;
- 		if ( ! uuid .empty() )
-@@ -1075,7 +1076,7 @@
- 			add_node_and_mountpoint( map, node, mountpoint ) ;
- 	}
- 
--	endmntent( fp ) ;
-+	fclose( fp ) ;
- }
- 
- void GParted_Core::add_node_and_mountpoint(
---- 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 @@
- #include <gtkmm/main.h>
- #include "../include/GParted_Core.h"
- 
-+#ifdef __sun
-+char *program_name;
-+#endif
-+
- int main( int argc, char *argv[] )
- {
-+#ifdef __sun
-+	program_name = argv[0];
-+#endif
-+
- 	//initialize thread system
- 	Glib::thread_init() ;
- 	GParted::GParted_Core::mainthread = Glib::Thread::self();
-@@ -51,7 +59,10 @@
- 	}
- 
- 	//deal with arguments..
--	std::vector<Glib::ustring> user_devices(argv + 1, argv + argc);
-+	std::vector<Glib::ustring> user_devices;
-+
-+	for ( int t = 1; t < argc; t++)
-+		user_devices.push_back(argv[t]);
- 	
- 	GParted::Win_GParted win_gparted( user_devices ) ; 
- 	Gtk::Main::run( win_gparted ) ;
--- a/components/gparted/patches/3.gcc.patch	Mon Sep 12 09:26:27 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-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
-@@ -118,6 +118,8 @@
- 	CTEXT_RESIZE_DISALLOWED_WARNING		// File system resizing currently disallowed reason
- } ;
- 
-+#undef FS
-+
- //struct to store file system information
- struct FS
- {
--- a/components/meta-packages/history/history	Mon Sep 12 09:26:27 2016 -0700
+++ b/components/meta-packages/history/history	Tue Sep 13 17:39:13 2016 -0700
@@ -5,7 +5,7 @@
 [email protected],5.11-0.130
 [email protected],5.11-0.171
 [email protected],5.11-0.171
[email protected],5.11-0.175.0.0.0.0.0 desktop/administration/[email protected]
[email protected],5.12-5.12.0.0.0.109.0 
 [email protected]
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.175.0.0.0.0.0
@@ -760,6 +760,7 @@
 database/mysql-51/[email protected],5.12-5.12.0.0.0.45.0
 database/mysql-51/[email protected],5.12-5.12.0.0.0.45.0
 desktop/administration/[email protected],5.11-0.175.0.0.0.0.0
+desktop/administration/[email protected],5.12-5.12.0.0.0.109.0 
 desktop/administration/[email protected],5.12-5.12.0.0.0.64.0
 desktop/[email protected],5.12-5.12.0.0.0.90.0
 desktop/cd-ripping/[email protected],5.12-5.12.0.0.0.90.0
upstream/oracle/userland-gate