Page MenuHomeSolus
Files F10836313

D1203.diff
No OneTemporary
Actions

D1203.diff
View Options

diff --git a/files/0001-Disable-docs.patch b/files/0001-Disable-docs.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Disable-docs.patch
@@ -0,0 +1,22 @@
+From b24694baa6f19070403a7b2e62b143dd55a7923a Mon Sep 17 00:00:00 2001
+From: Philipp Trulson <philipp@trulson.de>
+Date: Fri, 13 Oct 2017 23:05:10 +0200
+Subject: [PATCH] Disable Gnome Docs
+
+---
+ help/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/help/Makefile.am b/help/Makefile.am
+index bf297b5..99c48c6 100644
+--- a/help/Makefile.am
++++ b/help/Makefile.am
+@@ -1,4 +1,4 @@
+-include $(top_srcdir)/gnome-doc-utils.make
++#include $(top_srcdir)/gnome-doc-utils.make
+ dist-hook: doc-dist-hook
+
+ #The name of the help document to build.
+--
+2.14.2
+
diff --git a/files/0001-Support-pkexec.patch b/files/0001-Support-pkexec.patch
deleted file mode 100644
--- a/files/0001-Support-pkexec.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 66f8ecc4399ac53d2d74ed83b955bb478653ede2 Mon Sep 17 00:00:00 2001
-From: Ikey Doherty <ikey@solus-project.com>
-Date: Sat, 31 Oct 2015 17:37:55 +0000
-Subject: [PATCH 1/2] Support pkexec
-
-Signed-off-by: Ikey Doherty <ikey@solus-project.com>
----
- gparted.desktop.in.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gparted.desktop.in.in b/gparted.desktop.in.in
-index 4b41fe4..87bcd0f 100644
---- a/gparted.desktop.in.in
-+++ b/gparted.desktop.in.in
-@@ -3,7 +3,7 @@ _Name=GParted
- _GenericName=Partition Editor
- _X-GNOME-FullName=GParted Partition Editor
- _Comment=Create, reorganize, and delete partitions
--Exec=@gksuprog@ @installdir@/gparted %f
-+Exec=@installdir@/gparted_wrapper %f
- Icon=gparted
- Terminal=false
- Type=Application
---
-2.8.3
-
diff --git a/files/0002-Don-t-override-icons-at-all-leave-that-to-the-deskto.patch b/files/0002-Don-t-override-icons-at-all-leave-that-to-the-deskto.patch
deleted file mode 100644
--- a/files/0002-Don-t-override-icons-at-all-leave-that-to-the-deskto.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d76bec7cf39561942fba458ec34b13ee7de0642e Mon Sep 17 00:00:00 2001
-From: Ikey Doherty <ikey@solus-project.com>
-Date: Sat, 11 Jun 2016 22:10:40 +0100
-Subject: [PATCH 2/2] Don't override icons at all, leave that to the desktop
-
-Signed-off-by: Ikey Doherty <ikey@solus-project.com>
----
- src/Win_GParted.cc | 13 -------------
- 1 file changed, 13 deletions(-)
-
-diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
-index 63162b3..ebcc046 100644
---- a/src/Win_GParted.cc
-+++ b/src/Win_GParted.cc
-@@ -77,19 +77,6 @@ Win_GParted::Win_GParted( const std::vector<Glib::ustring> & user_devices )
- this ->set_title( _("GParted") );
- this ->set_default_size( 775, 500 );
-
-- 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 ;
-- }
--
- //Pack the main box
- this ->add( vbox_main );
-
---
-2.8.3
-
diff --git a/files/gparted_wrapper b/files/gparted_wrapper
deleted file mode 100644
--- a/files/gparted_wrapper
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-if [ $(which pkexec) ]; then
- pkexec --disable-internal-agent "/usr/sbin/gparted" "$@"
-else
- /usr/sbin/gparted "$@"
-fi
\ No newline at end of file
diff --git a/files/polkit.policy b/files/polkit.policy
deleted file mode 100644
--- a/files/polkit.policy
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-
- <action id="com.solus_project.pkexec.gparted.policy">
- <message>Authentication is required to run GParted</message>
- <icon_name>gparted</icon_name>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
- </defaults>
- <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted</annotate>
- <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
- </action>
-
-</policyconfig>
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : gparted
-version : 0.28.1
-release : 15
+version : 0.30.0
+release : 16
source :
- - http://downloads.sourceforge.net/gparted/gparted-0.28.1.tar.gz : 76891f14394754f7d6ecceba2af0e585bf89f9d780c389a255dcd41a2f45d333
+ - https://github.com/GNOME/gparted/archive/GPARTED_0_30_0.tar.gz : 4c04f0c04ea481975666de8c23ddf991154b6cce71c8b6749e5073cfa4afb999
license : GPL-2.0
summary : GParted is a free graphical disk partition editor
description: |
@@ -16,12 +16,11 @@
rundeps :
- gpart # Used for data recovery functionality
setup : |
- %patch -p1 < $pkgfiles/0001-Support-pkexec.patch
- %patch -p1 < $pkgfiles/0002-Don-t-override-icons-at-all-leave-that-to-the-deskto.patch
- %reconfigure --disable-doc --disable-scrollkeeper
+ %patch -p1 < $pkgfiles/0001-Disable-docs.patch
+ autoreconf -vfi
+ intltoolize
+ %configure --disable-doc --disable-scrollkeeper --enable-online-resize --enable-xhost-root
build : |
%make
install : |
- %make_install
- install -m 00644 -D $pkgfiles/polkit.policy $installdir/usr/share/polkit-1/actions/com.solus_project.pkexec.gparted.policy
- install -D -m 00655 $pkgfiles/gparted_wrapper $installdir/usr/sbin/gparted_wrapper
+ %make_install
\ No newline at end of file
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>gparted</Name>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Philipp Trulson</Name>
+ <Email>philipp@trulson.de</Email>
</Packager>
<License>GPL-2.0</License>
<Summary xml:lang="en">GParted is a free graphical disk partition editor</Summary>
@@ -17,6 +17,7 @@
<Description xml:lang="en">GNOME Partition Editor for creating, reorganizing, and deleting disk partitions. It uses libparted from the parted project to detect and manipulate partition tables. Optional file system tools permit managing file systems not included in libparted.
</Description>
<Files>
+ <Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/sbin</Path>
<Path fileType="data">/usr/share/appdata/gparted.appdata.xml</Path>
<Path fileType="data">/usr/share/applications/gparted.desktop</Path>
@@ -28,16 +29,16 @@
<Path fileType="data">/usr/share/icons/hicolor/scalable/apps/gparted.svg</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man</Path>
- <Path fileType="data">/usr/share/polkit-1/actions/com.solus_project.pkexec.gparted.policy</Path>
+ <Path fileType="data">/usr/share/polkit-1/actions/org.gnome.gparted.policy</Path>
</Files>
</Package>
<History>
- <Update release="15">
- <Date>2017-07-17</Date>
- <Version>0.28.1</Version>
+ <Update release="16">
+ <Date>2017-10-13</Date>
+ <Version>0.30.0</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Philipp Trulson</Name>
+ <Email>philipp@trulson.de</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Jun 9 2023, 2:20 PM (9 w, 13 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5853575
Default Alt Text
D1203.diff (7 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.