diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
| commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
| tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /app-editors/gedit | |
| parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) | |
gentoo resync : 02.02.2022
Diffstat (limited to 'app-editors/gedit')
| -rw-r--r-- | app-editors/gedit/Manifest | 3 | ||||
| -rw-r--r-- | app-editors/gedit/files/40.1-fix-meson-0.61.patch | 29 | ||||
| -rw-r--r-- | app-editors/gedit/gedit-40.1.ebuild | 4 |
3 files changed, 34 insertions, 2 deletions
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest index ef077a91ec8e..bdbaa6a36771 100644 --- a/app-editors/gedit/Manifest +++ b/app-editors/gedit/Manifest @@ -1,6 +1,7 @@ AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01baebedf4cf1bbd7971b89e4b14c55941fdeb824405f6ab6c9035b9b9d6fcac7ab8cf80270bd7d52f880b3f628140f74b0e4 SHA512 857955914028623ccb3f41b91e3a1d895901e7810764085fdd7daa40f455582dbf999cffede29519ba8097f09bbb02999a969bbff406d2822fcb4fd2feb82275 AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50 +AUX 40.1-fix-meson-0.61.patch 904 BLAKE2B acd66d002974c2030408fa32176e327205b8901e1c41ecb409d0fd6d95dd4e9f8ae79093a5a2f782c595189add73abe76e0049632b6e92a51c99a3df5ce164ac SHA512 fab0dc53cbdaa579dc583ce90760fa1fde5a4ab91d35346646c10ff3d1563168bec59f8cda70119d160cec964dba437910c7cc02a63c15a6472760de303f8c49 AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e DIST gedit-40.1.tar.xz 6850264 BLAKE2B 2baabac1254d56bf4c6a663012f88505c8f3cfcdd8fd8e020e05d807f727f71cf9088c398702f559e40ba7db31d3a9d135c1148f8a8b178c9107aa2675265910 SHA512 ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09 -EBUILD gedit-40.1.ebuild 2278 BLAKE2B 078d25e9c558d26d5438c5793fe23193e514dbeb5bff48d00e9b57a11ba33c47e25602680fb7348a9f8697df717adc8052ba49578a0532526799a6182d662420 SHA512 b75869262c0d824e4a113c23c7d44f570d1193e72831a0a2ac5d95af7e709e6b8a50f3961fb22da984af0358caa71d8ad2e301235c46627b0a7a3efef003c8d6 +EBUILD gedit-40.1.ebuild 2321 BLAKE2B 3022f5c55fb77f15e61d1f32860f8edb7844b019b0da297a48913f0391fb3a0b24e9da43dc511d930859e0216591a4e5103fbbf2009cf6bd8484deab7afefde2 SHA512 925fdcfbbe9111b67457cf6f07ded7d8dfb1addf0f73374800d14586085430ad656ee9cb948453e14959e33f1f7949cf9332b0b87d7dd6f019adcbdd45943bf3 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/app-editors/gedit/files/40.1-fix-meson-0.61.patch b/app-editors/gedit/files/40.1-fix-meson-0.61.patch new file mode 100644 index 000000000000..cac046067cb2 --- /dev/null +++ b/app-editors/gedit/files/40.1-fix-meson-0.61.patch @@ -0,0 +1,29 @@ +https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124.patch +https://bugs.gentoo.org/831925 + +From c6c7c6580bc7f82a7d449b8ee33ae44f8b6f4a1f Mon Sep 17 00:00:00 2001 +From: rvalue <i@rvalue.moe> +Date: Wed, 15 Dec 2021 07:02:09 +0000 +Subject: [PATCH] Remove incorrect args for i18n.merge_file + +The positional argument has been silently ignored for a time. And it causes failure +with "ERROR: Function does not take positional arguments" since meson 0.60.0 +--- a/data/meson.build ++++ b/data/meson.build +@@ -4,7 +4,6 @@ install_man('gedit.1') + + appdata = 'org.gnome.gedit.appdata.xml' + appdata_file = i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: '../po/', +@@ -23,7 +22,6 @@ endif + + desktop_file = 'org.gnome.gedit.desktop' + desktop_output_file = i18n.merge_file( +- desktop_file, + type: 'desktop', + input: desktop_file + '.in', + output: desktop_file, +GitLab diff --git a/app-editors/gedit/gedit-40.1.ebuild b/app-editors/gedit/gedit-40.1.ebuild index faf11bb7ae49..07697d136123 100644 --- a/app-editors/gedit/gedit-40.1.ebuild +++ b/app-editors/gedit/gedit-40.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -58,6 +58,8 @@ PATCHES=( # Make gspell and python optional "${FILESDIR}"/3.38-make-gspell-optional.patch "${FILESDIR}"/3.38-make-python-optional.patch + + "${FILESDIR}"/${PV}-fix-meson-0.61.patch ) pkg_setup() { |