diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-25 12:01:03 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-25 12:02:52 +0000 |
| commit | 2f8a12ad220585684ae057d232a7568e0e499ebc (patch) | |
| tree | 411913f1b36154c10eb85dce62acfff201032cf4 /main | |
| parent | 57c63f042b68d4481b9200423c8e8c52b18f38da (diff) | |
| download | aports-2f8a12ad220585684ae057d232a7568e0e499ebc.tar.bz2 aports-2f8a12ad220585684ae057d232a7568e0e499ebc.tar.xz | |
main/nautilus: build fix for glib-2.36
Diffstat (limited to 'main')
| -rw-r--r-- | main/nautilus/APKBUILD | 35 | ||||
| -rw-r--r-- | main/nautilus/glib-2.36.patch | 10 |
2 files changed, 43 insertions, 2 deletions
diff --git a/main/nautilus/APKBUILD b/main/nautilus/APKBUILD index 2d46568fc4..dea6db841d 100644 --- a/main/nautilus/APKBUILD +++ b/main/nautilus/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=nautilus pkgver=2.32.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME file manager" url="http://projects.gnome.org/nautilus" arch="all" @@ -41,6 +41,7 @@ source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.32/${pkgname}-${pkgve 011-keyboard-navigation.patch g_const_return.patch gmodule-underlinking.patch +glib-2.36.patch " _builddir="${srcdir}/${pkgname}-${pkgver}" @@ -52,6 +53,7 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done + sed -i -e '/^DISABLE_DEPRECATED_CFLAGS=/s/=.*/=""/' configure } build() { @@ -84,4 +86,33 @@ da51f2247159159a2f6233890592a733 002-automounting-locked-screen.patch 75ea4e2ce64d8220ae82e386a9554d50 010-localpath-preview.patch 1ca1703fffb82f53b5278b20f86656c0 011-keyboard-navigation.patch 69329cf155b211d6143fcdc68a8695bf g_const_return.patch -7e3c1434d5530a86630cc6c1d43149e3 gmodule-underlinking.patch" +7e3c1434d5530a86630cc6c1d43149e3 gmodule-underlinking.patch +c8554fe2e34028c866df3459dec81813 glib-2.36.patch" +sha256sums="802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303 nautilus-2.32.2.1.tar.bz2 +be86d21bf1e57ebf9583a8e6c66dbfb202d2b23f84a40f5cb5ee3940cb9aad49 001-filepeek-crash.patch +26dc94bbe29c2269bcbfefbfcc66120db8703aa3d11e605253db9751f731bec8 002-automounting-locked-screen.patch +a8ed4a739ae35de7d1b0a67c60fc946d2151a473fc7fb6c8cecc1ac227eb656e 003-filename-null.patch +5bc24968bb966b4afc4ce308f6118b5ec08bab2a48a081ab4390c7e41721a608 004-memory-leak.patch +3339318db6d0f0c9e10f09eff6b5766e6833192c9c1efd6ab26944ff7a605664 005-gbus-assertion.patch +63aafc8c4e0d25c78beef7eb89c823d48e5b31fa37d5f6e6480ae234f203fd72 006-select-extension.patch +e0fae17feaff1bd417bf45183dea82465258e513efb90a648d2dc5098d1ef672 007-tracker0.10-compat.patch +264bb1b5c17deebf6ac257db86b7aa4c9a8bfcab6ec99b9a9d511c9ed1979621 009-default-directories.patch +e7d572e0c008aec9a8b1f64fc8e3dd5713674841ebd0771d1d72aa73800d5617 010-localpath-preview.patch +09ba24583d06ffd7717b10b787b4845b0f5774ababed85c6857b957a0e6b05f8 011-keyboard-navigation.patch +42aab0e038779a4cfb2921780ac6f1e9fe2a9b242f4dcbab4dc6e70fdb4b7484 g_const_return.patch +231caff805d50dc5b6be4123f68e6c0077e24d7371a1708ce896f9cf4c658335 gmodule-underlinking.patch +ddb7f616d112b7e2b52b25f57d9564a7aabcd62a6e8fee27a38273c2654273a1 glib-2.36.patch" +sha512sums="cb9d65d16c8d771d182bb94d9de59c4054b05603b8ad33beeca26b41c3ca3c84581b596625f6503924c4a26f5ca1218c6d1e81c9d94e6cc637a3e8a941cde9b4 nautilus-2.32.2.1.tar.bz2 +a0906677d89e7ccbc3e0617db997bb1369eb32dcc4fb2b1c6ac594b29b47d533705ebedc3811fd3d28bd36ee65c31aea23c89463bb6f8c4a2a49a3b00314ff35 001-filepeek-crash.patch +0e82b5dadda5dbdc8f7d4a2a9cfc1ac39f36d808b4f696500d29f8a082c22aef061e49be736a63d6bb85487210c0a0c4e2b4455d92dd0052d79b88153a21fa8d 002-automounting-locked-screen.patch +534fdc10a83ebde5e777574742b6bf6fabb96bae7af3cd06cdfe4f0e9511b115898da1ff5f2a7754051f97c700d416b8d1462585ec818e691e2975be39ae8f40 003-filename-null.patch +e33dbed40ca0fb30dd7ef4c2d787910ed0bfc2aab40af5442b4c86332cef119a217bd83ad4c8e606cdc459c3ea73bec8a2a6308c3db4c9400e71566e8456284c 004-memory-leak.patch +ad44911465931a16b2a5e7d1131daf013fe63a748816110d20a17d709cb29ee9d5ba2c50b1b49c5211629bacbc0731a872395466ed85c5bf12cb0faca3945674 005-gbus-assertion.patch +7955747b1412d177512ffa6f4fbd07c49fcd95158b55a192179136878801624fed91e6f1240bdd02c9ab4a9eaaf220b2a014f9c934f06cd914f1c599c84ffa02 006-select-extension.patch +316e6ee5e982583090be0d1b65f006fa6ec41b5e39674f4f2ee9099e3248ae84504eaf126c319e312a255fced6a63c29eec1a24a5a2da626e58734f3938f4e9a 007-tracker0.10-compat.patch +dac3679d46b4583983fc22ad8c4037bd589a0d6fd66f41b84cbeb9148722b6bb6950c787e02612ff14ac89648e5c333ba29373e6d7b5343f36c644e754e7d5f0 009-default-directories.patch +4d0c6ff5dcac2a7cfa8f9677e2166a254d04475350c875a9943b63f4ed60e898393843f52c18d64042ceb4bc016fc0e43d13873f683dae5e8d54d3abcc2ba37c 010-localpath-preview.patch +8875781a5dec0e343eddb9289566b3b299a93680df8f84fbed30724c18a1de54c0a7501aba674238ac601ac805c687a93f1e414fb91bc20eb2f1f31a1382f29a 011-keyboard-navigation.patch +0022bf24420c72a04f0dc29b5d7392fcbbe59b4a0a4dfd1687381f97302a2da2809d7d54ee719f019c9f2b590cf87dd103e9e041923e72ef9e1b533ff52dbe03 g_const_return.patch +870b0325e45e4fc9eb6b0e12aeaefc44a96796eb2dfc9dc4f0f9e141ce15bd78cdf063accd49e2fd36fa5627a3aa60523fadc82895318d46208df52505ac5be7 gmodule-underlinking.patch +1c9fb7d28aa8c9845438fca372af75e334c2b66951dbd57cdd3c46f8934f23c84f2d3196bc0976f6540f935e8df2ef4f665ff79e42dfc28ac338e7d7cccf0eff glib-2.36.patch" diff --git a/main/nautilus/glib-2.36.patch b/main/nautilus/glib-2.36.patch new file mode 100644 index 0000000000..824f955c43 --- /dev/null +++ b/main/nautilus/glib-2.36.patch @@ -0,0 +1,10 @@ +--- ./eel/Makefile.orig 2013-04-25 11:43:20.962938407 +0000 ++++ ./eel/Makefile.in 2013-04-25 11:43:50.900065423 +0000 +@@ -320,7 +320,6 @@ + -DDATADIR=\""$(datadir)"\" \ + -DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \ +- -DG_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGMENU_I_KNOW_THIS_IS_UNSTABLE \ + $(NULL) |