diff options
| author |   haarp <main.haarp@gmail.com> | 2015-04-10 11:35:25 +0200 |
|---|---|---|
| committer | haarp <main.haarp@gmail.com> | 2015-04-10 11:35:25 +0200 |
| commit | 8f838d0b6ad4ee986be70a381e2bda465ab86385 (patch) | |
| tree | 89520088f7123dd989baf3eac37255ebe3f56946 /app-arch | |
| parent | Misc improvements (diff) | |
| download | haarp-8f838d0b6ad4ee986be70a381e2bda465ab86385.tar.gz haarp-8f838d0b6ad4ee986be70a381e2bda465ab86385.tar.bz2 haarp-8f838d0b6ad4ee986be70a381e2bda465ab86385.zip | |
Fix opening multiple file-roller instances
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/file-roller/Manifest | 3 | ||||
| -rw-r--r-- | app-arch/file-roller/file-roller-3.10.2.1-r1.ebuild (renamed from app-arch/file-roller/file-roller-3.10.2.1.ebuild) | 3 | ||||
| -rw-r--r-- | app-arch/file-roller/files/file-roller-3.10.2.1-mark_command_line_usage.patch | 25 |
3 files changed, 30 insertions, 1 deletions
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest index 66e8a4c..e07eb5b 100644 --- a/app-arch/file-roller/Manifest +++ b/app-arch/file-roller/Manifest @@ -1,4 +1,5 @@ AUX 3.6.0-packages.match 571 SHA256 3888ee8a6cb163d0e7813fde1d0ea028f2e47410aff8bec1e52c219e6bb7296d SHA512 899ff4ae7a8df9790ff3eb74f85b7d4b6ab7e7cd22cb2e3f5fcbf7006f9a327dfff799ecf30fae66c24097b81afaa8167ea972f37a8b983b09a2ebf1ee044212 WHIRLPOOL afd71f74d2776db559c5a60342f1c26e9d718321bc433ff7b99d98b6e22d42ede7f67901ff0c5b1d172a3ebd3ef5a067506085818f8514b0f15ece5ddf2684aa AUX file-roller-2.10.3-use_bin_tar.patch 504 SHA256 c22e742893800c4302df40af66b1eabeab700fea7326eada849f919bdd76c052 SHA512 e93b69af0e281590a362930580f13f2b85efec98d9a40c6b8becf3731c70713be106dbfbff9f4a7e783fc0dc0f72fdb78a063d5ab7d0c9c280a90fc58b778667 WHIRLPOOL 13e8bfa47665be629119adaeaa0b31092aa409916410bdf39caca11b2f87c4f949e2153037d0d52d51ee88c1009dd1b6265a4cc525da8f7e9621d4931d15887c +AUX file-roller-3.10.2.1-mark_command_line_usage.patch 854 SHA256 1df237050026c95badf853107737e9e64264d44c8011c81da6fbf0f368e06339 SHA512 1e42c3c08f5b3fdbcc7642f5c6b006b518ae97c21a2ac7fe72dae7eee7db41faea10e1cf2addd45ae391712a0cf7cf98e03c6989ba7cb50095ab5fef670580ef WHIRLPOOL 812df64b969fbabb5d3273290ff488008ed514d1d643386376b9978e28460843c26c96ef007aa4713ad33371d1e94b4cee2b32633530d19e6efaacc20efd394d DIST file-roller-3.10.2.1.tar.xz 1392792 SHA256 fde1104103df71c126e759089f12dc7fa25ec642308649e87d542ee7c3276790 SHA512 8b69c2531b3ad729d208c2b140d1dd6dd156cb34f24465a68c5cb7e94337d2ebbbadf9ecc98993565e525c976e64e454df339fdc914d05815b4cd33055aadfca WHIRLPOOL 5550d89d1a447fe1211185597db85eb0b70371faf8e8597225dc23d0f74c9a77eed237f2da0c02db66b8431b1428d88a08116d243eb942b28e50055ba3fbf629 -EBUILD file-roller-3.10.2.1.ebuild 2657 SHA256 972ef536cbfc5d68255c552afab49436d76f590910f56fdb47b4bc632d1949f2 SHA512 1088b645b61512ea84ae187156883813080aa543a2618c345a4ed7b1fc718ea8a9f199e88270050222e42393ff455e4ae1a6da1eeb3880db18e4fdd75458d490 WHIRLPOOL 21aa5a3375cd357cbae87a8625f060f6f1ff0d6c4690ffd003a4d5c0804b503f9b6e9fa0773306b5ef9c23c957115b2f7df6f61e2f6f750e06053dfe2f0326d9 +EBUILD file-roller-3.10.2.1-r1.ebuild 2792 SHA256 a2e9f0538e1385e8acc74db09975abb5c0b8b9e050168b58c013d9c440992a0c SHA512 b090c600b7414539a801da6d85d51f9fdd9657d3a49d515de156c5184cf100bea3f4bc6fb786f64d5c1f93a6bf9ad53c7ac41b1cd011e20fbda7b6640ea4185c WHIRLPOOL 0fb9e2ae2fe6b41c1b442667260b6c10695c3c5a16d9b6b6507dd8b76286abc06b8587c9ea5948dbd348520dacbcad404fe518cf50762bbacb9a13076459ce94 diff --git a/app-arch/file-roller/file-roller-3.10.2.1.ebuild b/app-arch/file-roller/file-roller-3.10.2.1-r1.ebuild index b6290c1..2a9b12a 100644 --- a/app-arch/file-roller/file-roller-3.10.2.1.ebuild +++ b/app-arch/file-roller/file-roller-3.10.2.1-r1.ebuild @@ -67,6 +67,9 @@ src_prepare() { # options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch + # Backport patch that allows multiple file-roller instances again + epatch "${FILESDIR}"/${PN}-3.10.2.1-mark_command_line_usage.patch + # File providing Gentoo package names for various archivers cp -f "${FILESDIR}/3.6.0-packages.match" data/packages.match || die diff --git a/app-arch/file-roller/files/file-roller-3.10.2.1-mark_command_line_usage.patch b/app-arch/file-roller/files/file-roller-3.10.2.1-mark_command_line_usage.patch new file mode 100644 index 0000000..29a28c6 --- /dev/null +++ b/app-arch/file-roller/files/file-roller-3.10.2.1-mark_command_line_usage.patch @@ -0,0 +1,25 @@ +From ead5ddd26ec18033fa677cdf253ce25d5a0324e8 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagna@src.gnome.org> +Date: Sat, 18 Jan 2014 14:14:23 +0100 +Subject: Application: mark that we handle the command line + +Otherwise activating the application a second time would fail. + +https://bugzilla.gnome.org/show_bug.cgi?id=722492 + +diff --git a/src/fr-application.c b/src/fr-application.c +index 0109a3a..f751bcf 100644 +--- a/src/fr-application.c ++++ b/src/fr-application.c +@@ -866,7 +866,7 @@ fr_application_new (void) + { + return g_object_new (fr_application_get_type (), + "application-id", "org.gnome.FileRoller", +- "flags", G_APPLICATION_FLAGS_NONE, ++ "flags", G_APPLICATION_HANDLES_COMMAND_LINE, + NULL); + } + +-- +cgit v0.10.2 + |