diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-09-08 08:23:42 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-09-08 08:23:42 +0000 |
| commit | 0dcb8b45c4f14115f56654ac114c59cbb94ea7e5 (patch) | |
| tree | edb856b9de23338183469df3cbea5487238420dd /x11-misc/gmrun | |
| parent | Clean up patches. (diff) | |
| download | historical-0dcb8b45c4f14115f56654ac114c59cbb94ea7e5.tar.gz historical-0dcb8b45c4f14115f56654ac114c59cbb94ea7e5.tar.bz2 historical-0dcb8b45c4f14115f56654ac114c59cbb94ea7e5.zip | |
Convert sed scripts to patch.
Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'x11-misc/gmrun')
| -rw-r--r-- | x11-misc/gmrun/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/gmrun/Manifest | 11 | ||||
| -rw-r--r-- | x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch | 35 | ||||
| -rw-r--r-- | x11-misc/gmrun/gmrun-0.9.2-r1.ebuild | 8 |
4 files changed, 49 insertions, 11 deletions
diff --git a/x11-misc/gmrun/ChangeLog b/x11-misc/gmrun/ChangeLog index e8012d2dad11..a8b3a0055f41 100644 --- a/x11-misc/gmrun/ChangeLog +++ b/x11-misc/gmrun/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/gmrun # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/ChangeLog,v 1.28 2014/09/08 08:18:55 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/ChangeLog,v 1.29 2014/09/08 08:23:41 jer Exp $ + + 08 Sep 2014; Jeroen Roovers <jer@gentoo.org> gmrun-0.9.2-r1.ebuild, + +files/gmrun-0.9.2-stlport.patch: + Convert sed scripts to patch. 08 Sep 2014; Jeroen Roovers <jer@gentoo.org> files/gmrun-0.9.2-gcc43.patch, files/gmrun-0.9.2-glibc210.patch, files/gmrun-0.9.2-sysconfdir.patch: diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest index 6e68bd7626c1..14154d1544c4 100644 --- a/x11-misc/gmrun/Manifest +++ b/x11-misc/gmrun/Manifest @@ -3,16 +3,17 @@ Hash: SHA256 AUX gmrun-0.9.2-gcc43.patch 744 SHA256 89b50fe01ab40386208de1f5ba32295fb6a33abb3e6fa809c402f26810124aba SHA512 376d0a5425f264044cb0d1635e0c5aaede0ad962fa21fc552cf2ae4145a33520f8035193fd4e9c3108ef5cfdc671aa2fc4922479836d392a0d3d287e810593c5 WHIRLPOOL 9955260f2ecc41f8295e47f2165ba73684019f0aeb98494598776806d187f8961f5a301beac06cea19efec4bf847af3005e4705508887d358ae999e8d77d2ef2 AUX gmrun-0.9.2-glibc210.patch 324 SHA256 3e3428398cc578e0dd3cea42ba8a4b9d98267e2305c6c307af5acaee82924ccf SHA512 6488186908e33fe27e4e4f6d81fe9dd5fc1bb74e15b2153ebd660788be75432e68dfebb6ee21b17a0711b99d5d1e54eaf0a4384111bfe56134cce817b4bed49d WHIRLPOOL 80c472b0c0722aeafb41f68e8c9abcd9c448c903e93c7d1f243952b0c94ebf514f0723553d147f8fba96374dfdc633f477e7100c625aa912f0c6e5000f27ced7 +AUX gmrun-0.9.2-stlport.patch 697 SHA256 eb586b0265bad3a74f124c1a3f1a79383fc587f5e62790aaaee7668c9639f01b SHA512 84ea68891309b6c3a29188e188e4572b7228abf3d874f138750cf51f33f8fc42aee33f8f4538fc80e324c16e64c68b739cc321cb94e49dd4ace5ec1b3bc4605d WHIRLPOOL 2f669306a8388e1bad33568d6b2354e4368e92c68023b5d4fca9dcccb9ab646f362543c6782b9df6b24abaf9856a93eadd9e80efafe5410c7314a3f7fcd74163 AUX gmrun-0.9.2-sysconfdir.patch 928 SHA256 de814c6c42e4f5ef7a00ed43d5eeb732596e389371f49e05d6fcc6308b56f0b0 SHA512 972345f6641ee1a7f0c5653c5df58a7f4d8f2bff2e84a02b8482dd354148ca60366236c6a35828639a109264fd9421a954567a5c4e30afb34b9c75ce43fcae85 WHIRLPOOL e3a08a59dc9f69400088792aff970b36c31960f79b7eaaa62b80defdcd91f1a0b8c22ed309c6128e379650d506f75f2998d34d670245944f1f41fe8236ed200e DIST gmrun-0.9.2.tar.gz 66097 SHA256 17297bce53249ccc7145931db22251b47f77ac355f78cf8abf1e87ae16341fa0 SHA512 3ce881463c23b6c2c39b4d41ff98f3d4a2b77f45a46d4ac43d8bbf726fcb3769b643436932714f9f5c22b855188928453810468d165af2c2433059a0149d6422 WHIRLPOOL d8ea7ddcc4625e64e35f281bb561af4cd94d65b1c6548c3f44f23f3334e31cb1ea96afcb1052c45e4fe01ba73f9863a738c571711ccf3c6dfe5c4f17b085e7d4 -EBUILD gmrun-0.9.2-r1.ebuild 1067 SHA256 cff5a1c1028eb63668f808a4a4ddb70f1d79b66895ecf207c8a7d78b1fe58882 SHA512 025495e4d1a8b766a7a601414eaf8699aa7348b97112fa4526d15b0faa8d0d34fa5b99080f887ba1758f6b564a4f8b1fc47f32812e9904f4106869d88836d3fc WHIRLPOOL 429a64fb56638c6e588a2b651df4ab325990f028675ed77d51e09274edc77d35ef4e55da4966a08bb4cebe2cb58dc2a78a683b212647ea94596df5f10c368759 +EBUILD gmrun-0.9.2-r1.ebuild 941 SHA256 ad2cfe3037386884a04015e1c29abbef52580d870ceaf1b26336e0e87ac534a8 SHA512 8470ac284920792fe5d9b3777f4fa6c07544f4d0378a7a090f670c4a95e9b09c247592cbef21bbf6bf56d6cf6756b342d679853ab3cefba0903b73cc475a87d3 WHIRLPOOL 68b5bffac5c51e837e2c4995a85174f769ce1c82410f05b425ab86d8406d1814fd64a625cd825b6c3a129b06a3d9e49ba5b860873e9aa472fec6e843c9e32891 EBUILD gmrun-0.9.2.ebuild 1060 SHA256 f856573126a291b7ca944e6d5e496cff07aad6f357a9e65846c7ca1d46282941 SHA512 8e6f96ac06181ba4dd56b92d91554b87ae3134dfa6fde185ef6f9c260027cc93c3dff5209b6a5692baf8712eb2e5ec38d71fad8db9e7b4d30f008e150b4ae1be WHIRLPOOL 0fe9d34116c5fe5b347e8636ee175093ad6cbd02bfec1f4ed41ebd7fb52d065a1a98b683ea0f66b67f716b6d11543c21d40e73390038f130b1876e704ca66e0b -MISC ChangeLog 3519 SHA256 02326910dbb7169d4489d745c134145dbf82b6db2e7b0f1f5b959dba7af86803 SHA512 bfdf4b95fbf3c06d133cea045e40b4c8d3e01f06231a1732efa5ad6de108079971b0c2e88029a5073294a31849740d592c05791b6db3b808c68285f8a799aac5 WHIRLPOOL cadd7498027afd611d6ff3b7bda6428085d95e99093a6b1f746a4b20f661de040e4593b845645e2db2145fe2badd0c30ff4e8687bf70611e07bf1b416458cd26 +MISC ChangeLog 3658 SHA256 22376d317ec4b8747006b7034e82a180d0e000ae5fcf4fd7f7ec23aca00337d9 SHA512 171671a9065c193af20150c256ef74da2902592b40132d0795243c56fa4e9144d9c559cdfdb92b9a200358dcf5309e68674fa5faab30bed3ecaadca6be2479b3 WHIRLPOOL 07c753ff346dbeee1b8457909f9f884371c50186d00b3653c662910a3f987f041a7b9d6a27c36a9a514231f10f8421d2615fc14af83c3b8e452937d76000bc52 MISC metadata.xml 338 SHA256 cd10c5f526519fc51527aaef8af03e72f6bfd18a8e6eadba81a0c5b928843c53 SHA512 6d99074f0570d902141bc1f195a6d0f3ceca6b775e11ae30c9d9e0ffd943637f8e314b7a144a65c9ab199dd0af57cd2762ffeb185e9aced2e909918a44c09482 WHIRLPOOL 4dc039d11a257db054a5997440a7acd90d0d884811c93e32779ae19a1ca7491a5d4dc75f80b50865151ce16cfd85f4d55f51e0affa367920fdcda3a2c44ebdd9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQNZnEACgkQVWmRsqeSphMQiwCbBKnLXYb4SJNWlm0hP9yHlgg2 -aLoAnjni05JqhNwZV6amx1wsc0p7M0yb -=tSEE +iEYEAREIAAYFAlQNZ44ACgkQVWmRsqeSphPo9gCfRms24lCtRXaT9xvn6obIHNff +bUgAn1PLuP5Wut8+L/4xIABgN6zlqTjH +=TQGY -----END PGP SIGNATURE----- diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch b/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch new file mode 100644 index 000000000000..426f652a0c2b --- /dev/null +++ b/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/show_bug.cgi?id=164339 + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + + INCLUDES = \ +- @GTK_CFLAGS@ @STLPORT_CXXFLAGS@ ++ @GTK_CFLAGS@ + + bin_PROGRAMS = gmrun + +@@ -13,7 +13,7 @@ + + # gmrun_LDFLAGS = -s + +-gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@ ++gmrun_LDADD = @GTK_LIBS@ + + AM_CPPFLAGS = \ + -DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"' +--- a/configure.in ++++ b/configure.in +@@ -37,8 +37,8 @@ + AC_HEADER_DIRENT + AC_HEADER_STDC + AC_PROG_CXX +-AC_PATH_STLPORT_LIB +-AC_PATH_STLPORT_INC ++dnl REMOVED _LIB ++dnl REMOVED _INC + + + AC_CHECK_FUNC( poptGetContext, diff --git a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild index 74e37354a163..d556e60defc3 100644 --- a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild +++ b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild,v 1.9 2014/03/04 20:24:07 vincent Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild,v 1.10 2014/09/08 08:23:41 jer Exp $ EAPI=5 inherit autotools eutils @@ -25,11 +25,9 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-gcc43.patch \ "${FILESDIR}"/${P}-sysconfdir.patch \ - "${FILESDIR}"/${P}-glibc210.patch + "${FILESDIR}"/${P}-glibc210.patch \ + "${FILESDIR}"/${P}-stlport.patch - # Disable check for STLport due to bug #164339 - sed -i -e 's,^AC_PATH_STLPORT,dnl REMOVED ,g' configure.in - sed -i -e 's,@STLPORT_[A-Z]\+@,,g' src/Makefile.am eautoreconf } |