August 2019 - crux-commits

ports/contrib (3.5): p5-alien-build: 1.79 -> 1.83
by crux＠crux.nu 20 Aug '19

20 Aug '19

commit cdcf4f34d78f67e258cee265a2ba73c6cbc97680 Author: Tim Biermann <tbier(a)posteo.de> Date: Tue Aug 20 17:45:24 2019 +0000 p5-alien-build: 1.79 -> 1.83 diff --git a/p5-alien-build/.footprint b/p5-alien-build/.footprint index dce3dfad..7c0daa6f 100644 --- a/p5-alien-build/.footprint +++ b/p5-alien-build/.footprint @@ -16,6 +16,10 @@ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/Alien/Build/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Interpolate.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Interpolate/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Interpolate/Default.pm +-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Log.pm +drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Log/ +-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Log/Abbreviate.pm +-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Log/Default.pm -r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Alien/Build/MM.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Manual/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Plugin.pm @@ -76,6 +80,7 @@ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Plugin/Test/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Util.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Version/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Alien/Build/Version/Basic.pm +-r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Alien/Build/rc.pm -r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Alien/Role.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/Test/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.28/Test/Alien.pm @@ -102,6 +107,9 @@ drwxr-xr-x root/root usr/share/man/man3/ -r--r--r-- root/root usr/share/man/man3/Alien::Build::CommandSequence.3pm.gz -r--r--r-- root/root usr/share/man/man3/Alien::Build::Interpolate.3pm.gz -r--r--r-- root/root usr/share/man/man3/Alien::Build::Interpolate::Default.3pm.gz +-r--r--r-- root/root usr/share/man/man3/Alien::Build::Log.3pm.gz +-r--r--r-- root/root usr/share/man/man3/Alien::Build::Log::Abbreviate.3pm.gz +-r--r--r-- root/root usr/share/man/man3/Alien::Build::Log::Default.3pm.gz -r--r--r-- root/root usr/share/man/man3/Alien::Build::MM.3pm.gz -r--r--r-- root/root usr/share/man/man3/Alien::Build::Manual::Alien.3pm.gz -r--r--r-- root/root usr/share/man/man3/Alien::Build::Manual::AlienAuthor.3pm.gz @@ -162,6 +170,7 @@ drwxr-xr-x root/root usr/share/man/man3/ -r--r--r-- root/root usr/share/man/man3/Alien::Build::Plugin::Test::Mock.3pm.gz -r--r--r-- root/root usr/share/man/man3/Alien::Build::Util.3pm.gz -r--r--r-- root/root usr/share/man/man3/Alien::Build::Version::Basic.3pm.gz +-r--r--r-- root/root usr/share/man/man3/Alien::Build::rc.3pm.gz -r--r--r-- root/root usr/share/man/man3/Alien::Role.3pm.gz -r--r--r-- root/root usr/share/man/man3/Test::Alien.3pm.gz -r--r--r-- root/root usr/share/man/man3/Test::Alien::Build.3pm.gz diff --git a/p5-alien-build/.signature b/p5-alien-build/.signature index 6de5e251..f1ffc0f7 100644 --- a/p5-alien-build/.signature +++ b/p5-alien-build/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31LfEil1lD051itZf1L4/MlskxblXKKpTZSTcEfFYT+1uJAAvOp7/B6aUD37aDkbpUpWPxijmY/426aCJBG6+Qs= -SHA256 (Pkgfile) = 00eb1ea1f9621aee11aa459fe7c8d7686286c7232e3217c109fc7b57dd76f577 -SHA256 (.footprint) = 60301fe759b46774582c17a8fe8866a2afbfd6d80dfd9aae8aa3cd122384b33c -SHA256 (Alien-Build-1.79.tar.gz) = 7122932d72618cd5001bdbb1e7075231160b9dc346cf9078b78d1ea3fa8f14a3 +RWSagIOpLGJF31eqD21jW6J/j9vy+HgxawyG129pyO6Z0A1F2rSsHIsoWm+Wr0mjrhkGk2h/87kG+bQKjKWNOfPJ9hEsZ/G+Qgs= +SHA256 (Pkgfile) = adc69f98dae75b6bb3412a7df876b261e1763ba0ac8d5db2542b847cbe6a819b +SHA256 (.footprint) = f4f1f1e418b61c84559717889dd8281c64bd26ca8784b7cd1bf2ae95146d3165 +SHA256 (Alien-Build-1.83.tar.gz) = 8076d4349cd250f1b18684b6b687b7ad146786cabc5451eb8edf3dd65dd7ca5a diff --git a/p5-alien-build/Pkgfile b/p5-alien-build/Pkgfile index 29a56d54..9feb98a7 100644 --- a/p5-alien-build/Pkgfile +++ b/p5-alien-build/Pkgfile @@ -4,7 +4,7 @@ # Depends on: p5-capture-tiny p5-ffi-checklib p5-file-chdir p5-file-which p5-path-tiny name=p5-alien-build -version=1.79 +version=1.83 release=1 source=(https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-$ver…

1 0

ports/opt (3.5): flash-player-plugin: update to 32.0.0.238
by crux＠crux.nu 20 Aug '19

20 Aug '19

commit ffa3dbf297059cb9ee0ad6b1b76a0c0415a9f664 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Aug 20 14:32:00 2019 +0200 flash-player-plugin: update to 32.0.0.238 diff --git a/flash-player-plugin/.signature b/flash-player-plugin/.signature index 8d6935f77..92f2defcd 100644 --- a/flash-player-plugin/.signature +++ b/flash-player-plugin/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YcP3zWEXtQonsxAO8RhuCMV5rYxX7djOo+5XGXDSuIO1Ci/MWamOUSjmVBFsw9swKJOkuYMRN7vaY1ryvrtfAQ= -SHA256 (Pkgfile) = a35d36cc55708674fcc091657df123eb97dedbcd130ea72ce6095863e1759f65 +RWSE3ohX2g5d/cyxul7t0m0/I47Xv7Sn6vBBlJQKwZstYLZ4H+yiGznq24YYgIXmriZ34mdJVyt7k/cX7Rn2B0oj92R1h394egc= +SHA256 (Pkgfile) = fa6c7de222d842f0c025bf1604ef363fc55ba6366174c28eda696a4f06d03064 SHA256 (.footprint) = 9bc6ecbc9ca40c49f8ac0db0024a96e10a49e188ae0402544f6b70ab32e7277f -SHA256 (flash-player-npapi-32.0.0.223-release.x86_64.rpm) = 7cb43861b0831fc51e961d34f4509d1b261b3ad1c7a0399095a223829a303312 +SHA256 (flash-player-npapi-32.0.0.238-release.x86_64.rpm) = 6315fb59c3f6cbf9b509c47b0e635077576f6ca9709697c0ed123d5f1c08ce46 diff --git a/flash-player-plugin/Pkgfile b/flash-player-plugin/Pkgfile index a91611b8c..746bcce60 100644 --- a/flash-player-plugin/Pkgfile +++ b/flash-player-plugin/Pkgfile @@ -4,7 +4,7 @@ # Depends on: util-linux gtk nss libglvnd xorg-libxdamage xorg-libxt name=flash-player-plugin -version=32.0.0.223 +version=32.0.0.238 release=1 source=(https://fpdownload.adobe.com/pub/flashplayer/pdc/$version/flash-pla…

1 0

ports/compat-32 (3.5): libnm-32: add missing .32bit file
by crux＠crux.nu 19 Aug '19

19 Aug '19

commit f944231555dbde1b013a53f513961a78c512a923 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue Aug 20 08:49:32 2019 +1000 libnm-32: add missing .32bit file diff --git a/libnm-32/.32bit b/libnm-32/.32bit new file mode 100644 index 0000000..e69de29

1 0

ports/opt (3.5): rust: update footprint some new files from cargo crates
by crux＠crux.nu 19 Aug '19

19 Aug '19

commit 8d39b86100eef90db333cd0895931b139b142317 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue Aug 20 08:46:58 2019 +1000 rust: update footprint some new files from cargo crates diff --git a/rust/.footprint b/rust/.footprint index 1a5ee5aa6..315e75733 100644 --- a/rust/.footprint +++ b/rust/.footprint @@ -1418,8 +1418,25 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/src/tools/rustc-std-workspace-core -rw-r--r-- root/root usr/lib/rustlib/src/rust/src/tools/rustc-std-workspace-core/lib.rs drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/ drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/ +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/liballoc-6ab3037fd5588637.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libbacktrace-bc6c8e926cc6dcf3.json -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libbacktrace_sys-789ee1b2e460e393.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libcfg_if-94f117647cc4218a.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libcompiler_builtins-3ea4fde368686f69.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libcore-1e679a32e029a088.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libhashbrown-14f2cae0b852766e.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/liblibc-d506890022ca9158.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libpanic_abort-e7fcb7684e795a2f.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libpanic_unwind-c73ce04c1d4e9a10.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/librustc_asan-a2b21673961891f7.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/librustc_demangle-8a3e901639b80fb4.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/librustc_lsan-6872b8e6c4983ef1.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/librustc_msan-dda67d20a9a8ae55.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/librustc_std_workspace_alloc-385f3fe88705ad90.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/librustc_std_workspace_core-b11d340704c06da8.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/librustc_tsan-3f5e90fc0418d8df.json -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libstd-1a98dbd9ff44fc07.json +-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/analysis/libunwind-2c98ad7371c98a40.json drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/ -rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/ diff --git a/rust/.signature b/rust/.signature index c8855614f..d9f03e4e6 100644 --- a/rust/.signature +++ b/rust/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VpUxV1vvD5k3wcbPi3wkhl3y7dXJSU7bKf4CUsdpB2ktEorfRUmmOFUSV8QM4QoKeTdqZn14XD/Z2vOUkH7NAA= +RWSE3ohX2g5d/Tg+ciuxEcE5t9SB3aRuYcJPaoH7L5L7CA9XVOaw98bp2KwMuYelzTM4bCoIFOArEzUB13WKwgmcCc8Z+BbkaQI= SHA256 (Pkgfile) = 8bc3a7559c7500a00a6ebda06a2c22d41564f4dcb1100d2624972c4d05039736 -SHA256 (.footprint) = 6d0284bd4e77e06a656eba76850b7ffa7c1ce8bbca8db37670b54663fc6830b7 +SHA256 (.footprint) = e2654fb225d26f71362e124cd57bcfaff7db093fe35e9e73ec4d3914fcef98c3 SHA256 (rustc-1.37.0-src.tar.gz) = 120e7020d065499cc6b28759ff04153bfdc2ac9b5adeb252331a4eb87cbe38c3 SHA256 (rust-std-1.36.0-x86_64-unknown-linux-gnu.tar.gz) = f92425592c02d4681a5c5ae43ac3ad7ddcc218da50fc651ddc5c2240843a7f31 SHA256 (rustc-1.36.0-x86_64-unknown-linux-gnu.tar.gz) = 7c149fa1695b41e8e1edcb95dca199522889f119be99f922741084d50470a9e5

1 0

ports/opt (3.5): rust: update signature for footprint
by crux＠crux.nu 19 Aug '19

19 Aug '19

commit 07bfb2792dcbc825e713f334626ad640f7c8f247 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue Aug 20 00:02:14 2019 +1000 rust: update signature for footprint diff --git a/rust/.signature b/rust/.signature index 6d6760c33..c8855614f 100644 --- a/rust/.signature +++ b/rust/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SUcDDHacU+Z5wNrnGodBzj9JU5JbpD30br76B0fDFtv0oajdiDw3OtZkp4GPPglKqrNPY2ME5nNNYrbuedYCwU= +RWSE3ohX2g5d/VpUxV1vvD5k3wcbPi3wkhl3y7dXJSU7bKf4CUsdpB2ktEorfRUmmOFUSV8QM4QoKeTdqZn14XD/Z2vOUkH7NAA= SHA256 (Pkgfile) = 8bc3a7559c7500a00a6ebda06a2c22d41564f4dcb1100d2624972c4d05039736 -SHA256 (.footprint) = 649b911e33cd6bb1333281e76ea497b275c63c947059cadc175dc679980cb63f +SHA256 (.footprint) = 6d0284bd4e77e06a656eba76850b7ffa7c1ce8bbca8db37670b54663fc6830b7 SHA256 (rustc-1.37.0-src.tar.gz) = 120e7020d065499cc6b28759ff04153bfdc2ac9b5adeb252331a4eb87cbe38c3 SHA256 (rust-std-1.36.0-x86_64-unknown-linux-gnu.tar.gz) = f92425592c02d4681a5c5ae43ac3ad7ddcc218da50fc651ddc5c2240843a7f31 SHA256 (rustc-1.36.0-x86_64-unknown-linux-gnu.tar.gz) = 7c149fa1695b41e8e1edcb95dca199522889f119be99f922741084d50470a9e5

1 0

ports/opt (3.5): whois: update to 5.5.1
by crux＠crux.nu 19 Aug '19

19 Aug '19

commit cd70b261ccd032c71b54cfa858c5a59b5405d8d1 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Aug 19 15:51:09 2019 +0200 whois: update to 5.5.1 diff --git a/whois/.signature b/whois/.signature index 09842806f..843e19df0 100644 --- a/whois/.signature +++ b/whois/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VIpQddB3Wzlm3elJZkcmFs7FlabdrRhNmAOzKNp0a1DyCeYgsPaSDgFejVOZ5zs8lWJWHZRmmU0HdBzdRFcxgU= -SHA256 (Pkgfile) = dbba4df1bd0ab3c6fcd7ed2af435e2e63762afd2c5147558ccd15e4e07a7236d +RWSE3ohX2g5d/fX1VyJBA0jylngwXyy2MLsYFaqfcE7viB4elsZwmH8vVBMEu/B6M4gjvVOkBMLABkc22LIVDKj2ycqy1JTDiw0= +SHA256 (Pkgfile) = 7f38558a68d7ba6e832be80f997d0848ba8d15a30fb0c558470509d412d69496 SHA256 (.footprint) = 088320b1f1f562656da70993b637917de5d36c71004a3136af89c7ca093cf871 -SHA256 (whois_5.5.0.tar.xz) = 64ec63339d7ad559cd6722bd3141a1e5787817bd921841a813ee17a0a34b6f3d +SHA256 (whois_5.5.1.tar.xz) = ee8d802f2e6639d44db3c326f3f5e059a8571a8cd0da87e60c6ddb06713cac82 diff --git a/whois/Pkgfile b/whois/Pkgfile index 4a1568b51..cdc9608f4 100644 --- a/whois/Pkgfile +++ b/whois/Pkgfile @@ -4,12 +4,12 @@ # Packager: Olle Gustafsson, ogg at linux dot se name=whois -version=5.5.0 +version=5.5.1 release=1 source=(http://ftp.debian.org/debian/pool/main/w/$name/$name\_$version.tar.… build() { - cd $name-5.4.4 + cd $name sed -i "/^CFLAGS/s/=.*$/=$CFLAGS/" Makefile make CONFIG_FILE='/etc/whois.conf' whois install -D -m 0755 whois $PKG/usr/bin/whois

1 0

ports/opt (3.5): imagemagick: fix signature
by crux＠crux.nu 19 Aug '19

19 Aug '19

commit e63a793c69e19212d2adb848012aba5eb27a068a Author: Juergen Daubert <jue(a)jue.li> Date: Mon Aug 19 15:46:12 2019 +0200 imagemagick: fix signature diff --git a/imagemagick/.signature b/imagemagick/.signature index 9dc9285f9..5a84b599b 100644 --- a/imagemagick/.signature +++ b/imagemagick/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/exCd+9crGVoJPhA9MqmYC1XNW2f8wUr3KNzYEu9QIqlwiYW+60ML6JvtRr+NNAwubsuDvczaW3p3CcoZv5JVgQ= -SHA256 (Pkgfile) = 9bb49bc7fdd77a6c137081d110110262bdad1924f6a7d891f6f81942e4b6b2d2 +RWSE3ohX2g5d/eHnhZfoEg8ZJNXAnldL9ty3i/iXFRf8L7DzFpj5/0JFhjWrQoxFiUyMqIEGeZ5mYM8tTNjO1u8o4AMrd8tM+wY= +SHA256 (Pkgfile) = 6e49a66e8cf6ce4c70db98c39e30f1e12117f6a597bafd871b758d778057fb2a SHA256 (.footprint) = 48c9cb17e55a45ee9cab9fc3b1a4b2fb6c16ca0b420098ba5072950761923b46 SHA256 (ImageMagick-7.0.8-61.tar.xz) = a8559e51eff5c146d7d3c0e90db4ea2b7e0a19c5359383751ed04b6db074b7d9

1 0

ports/opt (3.5): libunique: new maintainer, use patch from BLFS
by crux＠crux.nu 19 Aug '19

19 Aug '19

commit e568c9cb8cabca708f5664377f3ea761bb89bd6c Author: Juergen Daubert <jue(a)jue.li> Date: Mon Aug 19 15:40:17 2019 +0200 libunique: new maintainer, use patch from BLFS diff --git a/libunique/.signature b/libunique/.signature index d24416a62..a219f2c68 100644 --- a/libunique/.signature +++ b/libunique/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WR8FBeKc/o6kG6v1eKKzLKW38lGy/9ApGPl3p2ce5duWr2kzwSHBCUYkX/N5bEM6vhRAlOQgG1//kddBfKefAg= -SHA256 (Pkgfile) = 9139e41fac77f104f99a69a86f6070f93d0a373408dd81fca0c47e74bb99f3f3 +RWSE3ohX2g5d/UipwypcW6KSWYTudM/lsmKQxEEBaJe0LiW/Q5WPc+aBgxn2gJqyuFsf88x6X91r2CyDfradgyZz2SleOd/uiwY= +SHA256 (Pkgfile) = 47be19aa0196e5cbada357332167e436362398a244e73b51a84e05bd19bf2468 SHA256 (.footprint) = f10a391e8c050c0eb34cf9ef4db2a0644c58ae316a07395c7f7ccc0a5263a610 SHA256 (libunique-1.1.6.tar.bz2) = e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb -SHA256 (G_CONST_RETURN.patch) = 0ff78cc325190d0a167257321c9381befaab0769ff829c4dd50ddbaca337407a +SHA256 (libunique-1.1.6-upstream_fixes-1.patch) = 36203c672c520e508e38b59ab7cc65297ac209e0e70a398b78275687a2126589 diff --git a/libunique/G_CONST_RETURN.patch b/libunique/G_CONST_RETURN.patch deleted file mode 100644 index f3bb29743..000000000 --- a/libunique/G_CONST_RETURN.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -Nur libunique-1.1.6.orig/unique/uniqueapp.c libunique-1.1.6/unique/uniqueapp.c ---- libunique-1.1.6.orig/unique/uniqueapp.c 2011-12-01 07:38:17.748122298 +0000 -+++ libunique-1.1.6/unique/uniqueapp.c 2011-12-01 07:39:59.132319788 +0000 -@@ -781,7 +781,7 @@ - } - - --G_CONST_RETURN gchar * -+const gchar * - unique_command_to_string (UniqueApp *app, - gint command) - { -@@ -863,7 +863,7 @@ - return retval; - } - --G_CONST_RETURN gchar * -+const gchar * - unique_response_to_string (UniqueResponse response) - { - GEnumClass *enum_class; -diff -Nur libunique-1.1.6.orig/unique/uniquebackend.c libunique-1.1.6/unique/uniquebackend.c ---- libunique-1.1.6.orig/unique/uniquebackend.c 2011-12-01 07:38:17.748122298 +0000 -+++ libunique-1.1.6/unique/uniquebackend.c 2011-12-01 07:39:24.418677950 +0000 -@@ -111,7 +111,7 @@ - * - * Return value: FIXME - */ --G_CONST_RETURN gchar * -+const gchar * - unique_backend_get_name (UniqueBackend *backend) - { - g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); -@@ -154,7 +154,7 @@ - * - * Return value: FIXME - */ --G_CONST_RETURN gchar * -+const gchar * - unique_backend_get_startup_id (UniqueBackend *backend) - { - g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); -diff -Nur libunique-1.1.6.orig/unique/uniquebackend.h libunique-1.1.6/unique/uniquebackend.h ---- libunique-1.1.6.orig/unique/uniquebackend.h 2011-12-01 07:38:17.748122298 +0000 -+++ libunique-1.1.6/unique/uniquebackend.h 2011-12-01 07:42:13.833467492 +0000 -@@ -94,10 +94,10 @@ - - UniqueBackend * unique_backend_create (void); - --G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); -+const gchar *unique_backend_get_name (UniqueBackend *backend); - void unique_backend_set_name (UniqueBackend *backend, - const gchar *name); --G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); -+const gchar *unique_backend_get_startup_id (UniqueBackend *backend); - void unique_backend_set_startup_id (UniqueBackend *backend, - const gchar *startup_id); - GdkScreen * unique_backend_get_screen (UniqueBackend *backend); -diff -Nur libunique-1.1.6.orig/unique/uniqueinternals.h libunique-1.1.6/unique/uniqueinternals.h ---- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-12-01 07:38:17.748122298 +0000 -+++ libunique-1.1.6/unique/uniqueinternals.h 2011-12-01 07:41:17.142977914 +0000 -@@ -44,11 +44,11 @@ - * and then back into an id - */ - UniqueResponse unique_response_from_string (const gchar *response); --G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); -+const gchar *unique_response_to_string (UniqueResponse response); - - gint unique_command_from_string (UniqueApp *app, - const gchar *command); --G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, -+const gchar *unique_command_to_string (UniqueApp *app, - gint command); - - G_END_DECLS -diff -Nur libunique-1.1.6.orig/unique/uniquemessage.c libunique-1.1.6/unique/uniquemessage.c ---- libunique-1.1.6.orig/unique/uniquemessage.c 2011-12-01 07:38:17.748122298 +0000 -+++ libunique-1.1.6/unique/uniquemessage.c 2011-12-01 07:41:45.743225713 +0000 -@@ -185,7 +185,7 @@ - * - * Since: 1.0.2 - */ --G_CONST_RETURN guchar * -+const guchar * - unique_message_data_get (UniqueMessageData *message_data, - gsize *length) - { -@@ -525,7 +525,7 @@ - * owned by the #UniqueMessageData structure and should not be - * modified or freed - */ --G_CONST_RETURN gchar * -+const gchar * - unique_message_data_get_startup_id (UniqueMessageData *message_data) - { - g_return_val_if_fail (message_data != NULL, NULL); -diff -Nur libunique-1.1.6.orig/unique/uniquemessage.h libunique-1.1.6/unique/uniquemessage.h ---- libunique-1.1.6.orig/unique/uniquemessage.h 2011-12-01 07:38:17.748122298 +0000 -+++ libunique-1.1.6/unique/uniquemessage.h 2011-12-01 07:40:47.576064565 +0000 -@@ -48,7 +48,7 @@ - void unique_message_data_set (UniqueMessageData *message_data, - const guchar *data, - gsize length); --G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, -+const guchar *unique_message_data_get (UniqueMessageData *message_data, - gsize *length); - - gboolean unique_message_data_set_text (UniqueMessageData *message_data, -@@ -63,7 +63,7 @@ - gchar * unique_message_data_get_filename (UniqueMessageData *message_data); - - GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); --G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); -+const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); - guint unique_message_data_get_workspace (UniqueMessageData *message_data); - - G_END_DECLS - diff --git a/libunique/Pkgfile b/libunique/Pkgfile index 098e85b6b..78042e0fa 100644 --- a/libunique/Pkgfile +++ b/libunique/Pkgfile @@ -1,32 +1,28 @@ # Description: Unique is a library for writing single instance application -# URL: https://wiki.gnome.org/Attic/LibUnique -# Maintainer: Jose V Beneyto, sepen at crux dot nu -# Packager: Jose V Beneyto, sepen at crux dot nu -# Depends on: gtk xorg-libxdamage +# URL: http://live.gnome.org/LibUnique +# Maintainer: Juergen Daubert, jue at crux dot nu +# Depends on: gtk3 xorg-libxdamage name=libunique version=1.1.6 -release=4 +release=5 source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$versio… \ - G_CONST_RETURN.patch) + http://www.linuxfromscratch.org/patches/blfs/svn/$name-$version-upstream_fi…) build() { - cd $name-$version + cd $name-$version - patch -p1 -i $SRC/G_CONST_RETURN.patch + patch -p1 -i $SRC/$name-$version-upstream_fixes-1.patch - ./configure --prefix=/usr \ - --disable-dbus \ - --disable-static \ - --disable-debug \ - --with-x + autoreconf -fi + ./configure \ + --prefix=/usr \ + --disable-dbus \ + --disable-debug \ + --with-x - sed -i $(find . -type f -name Makefile) \ - -e 's|aclocal-1.11|aclocal|g' \ - -e 's|automake-1.11|automake|g' + make + make DESTDIR=$PKG install - make - make DESTDIR=$PKG install - - rm -rf $PKG/usr/share/gtk-doc + rm -r $PKG/usr/share/gtk-doc }

1 0

ports/contrib (3.5): distcc-monitor: dropped
by crux＠crux.nu 19 Aug '19

19 Aug '19

commit 8924ad465ab39c880d894fdd3f99339fc261b799 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Mon Aug 19 23:31:46 2019 +1000 distcc-monitor: dropped diff --git a/distcc-monitor/.footprint b/distcc-monitor/.footprint deleted file mode 100644 index 99ed99c6..00000000 --- a/distcc-monitor/.footprint +++ /dev/null @@ -1,60 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/distccmon-gnome -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/python2.7/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server-3.1-py2.7.egg-info -drwxr-xr-x root/root usr/lib/python2.7/site-packages/include_server/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/__init__.py (EMPTY) --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/__init__.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/basics.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/basics.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/basics_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/basics_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/c_extensions_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/c_extensions_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/cache_basics.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/cache_basics.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/compiler_defaults.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/compiler_defaults.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/compress_files.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/compress_files.pyc --rwxr-xr-x root/root usr/lib/python2.7/site-packages/include_server/distcc_pump_c_extensions.so --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer_memoizing_node.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer_memoizing_node.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer_memoizing_node_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer_memoizing_node_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_analyzer_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_server.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_server.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_server_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/include_server_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/macro_eval.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/macro_eval.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/macro_eval_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/macro_eval_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/mirror_path.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/mirror_path.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/mirror_path_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/mirror_path_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_command.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_command.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_command_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_command_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_file.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_file.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_file_test.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/parse_file_test.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/run.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/run.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/setup.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/setup.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/statistics.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/include_server/statistics.pyc -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/distcc/ --rw-r--r-- root/root usr/share/distcc/distccmon-gnome-icon.png diff --git a/distcc-monitor/.signature b/distcc-monitor/.signature deleted file mode 100644 index 4e7f80c0..00000000 --- a/distcc-monitor/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+UMijs4sIMiv+TBhk28WkTSQpZm3o3A7Ja8LlyqxKjoE53a+Z4Jg6bBRnRleSvJh/gEngiYRr0+xITGIEX4DgY= -SHA256 (Pkgfile) = 1c03e2b0acb4723a13cb59aa4e61274695500a59d5be436fddc14f97a0fd8750 -SHA256 (.footprint) = 685b44dbf74dd2a2c0168be7c673bd7411dc9a139192fb21ff0818e446712b69 -SHA256 (distcc-3.1.tar.bz2) = f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89 diff --git a/distcc-monitor/Pkgfile b/distcc-monitor/Pkgfile deleted file mode 100644 index 62d64782..00000000 --- a/distcc-monitor/Pkgfile +++ /dev/null @@ -1,27 +0,0 @@ -# Description: A graphical monitor for distcc. -# URL: http://distcc.org/ -# Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Johannes Winkelmann, jw at tks6 dot net -# Depends on: distcc gtk - - -name=distcc-monitor -version=3.1 -release=1 -source=(http://distcc.googlecode.com/files/distcc-$version.tar.bz2) - -build() { - cd distcc-$version - - ./configure \ - --prefix=/usr \ - --disable-nls \ - --with-gtk - - make distccmon-gnome - make distccmon-gnome DESTDIR=$PKG install - - rm -r $PKG/usr/etc $PKG/usr/bin/{lsdistcc,pump} - rm -r $PKG/usr/{share/doc/,man,bin/distcc{,d,mon-text}} - rm $PKG/usr/share/distcc/distccmon-gnome.desktop -}

1 0

ports/contrib (3.5): distcc: 3.1 -> 3.3.3
by crux＠crux.nu 19 Aug '19

19 Aug '19

commit d0d951f448074fdf4d87335a4d9853145ecd5300 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Mon Aug 19 23:29:14 2019 +1000 distcc: 3.1 -> 3.3.3 diff --git a/distcc/.footprint b/distcc/.footprint index 5d8c083b..0470c0dd 100644 --- a/distcc/.footprint +++ b/distcc/.footprint @@ -21,3 +21,4 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/distcc.1.gz -rw-r--r-- root/root usr/share/man/man1/distccd.1.gz -rw-r--r-- root/root usr/share/man/man1/distccmon-text.1.gz +-rw-r--r-- root/root usr/share/man/man1/lsdistcc.1.gz diff --git a/distcc/.signature b/distcc/.signature index ee217c23..a0f37603 100644 --- a/distcc/.signature +++ b/distcc/.signature @@ -1,9 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zTsG3UOty2EqkPJk69e0iFdOoM9rSrCUyKWGLUliXrZYqVovj4vRvF+Wjij6XJ5sOEQetfXsajMppEu68Kk8Ag= -SHA256 (Pkgfile) = b2c90c5e673cb8bd883226c9b0ed315e5c846806498541d03e913671a750cf7e -SHA256 (.footprint) = 156f6ce2096912e79f79424c6937d1bdabf2bdcb5b19abadee4512fda44f2fdf -SHA256 (distcc-3.1.tar.gz) = 721523b81584b4104cf48da8d629ffa0768adb4e032885dcd4e25ffd6703dd63 +RWSagIOpLGJF3zSQHvqBKxQHWXcO8HEc8c6VY9yvtukcdhj/NSv7K7VGVaeB3KCFm+q9okEMaqKEr7+zU2Ap6yosj/uw3K4nXA8= +SHA256 (Pkgfile) = bae8ad528bc728efb13331347d4cfcc676d91a9f67ad4a951a17088dd0d9776e +SHA256 (.footprint) = 96261a14be1f68dc197a6eeab9ce9ffa685b7921e7802d2e62313e11e68575d4 +SHA256 (distcc-3.3.3.tar.gz) = bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc SHA256 (distccd) = d440c68490aab6c4552848d9253d033a0169cae56a0b94d75f68fa81642bb847 -SHA256 (distcc-3.1-freedesktop.patch) = bf8694f4d1eb5e757615929bc58587f538ce733891097eb42204423cab644798 -SHA256 (distcc-3.1-python.patch) = 8ba3c0745a30b5901cfb37f4231d754e5779cbc5a6fa173fb196661d2a035cc2 -SHA256 (distcc-3.1-argc-fix.patch) = e576553f27c7fabc2dcd3f361a98e2db70fef9fa4f08df91a8bb00c178912a1b diff --git a/distcc/Pkgfile b/distcc/Pkgfile index 58195471..47c5702f 100644 --- a/distcc/Pkgfile +++ b/distcc/Pkgfile @@ -1,41 +1,33 @@ # Description: A tool to distribute compilations. # URL: http://distcc.org/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Johannes Winkelmann, jw at tks6 dot net -# Optional: python +# Optional: python3 gtk avahi name=distcc -version=3.1 -release=6 -source=(https://github.com/distcc/distcc/archive/$name-$version.tar.gz - distccd - distcc-3.1-freedesktop.patch - distcc-3.1-python.patch - distcc-3.1-argc-fix.patch) +version=3.3.3 +release=1 +source=(https://github.com/distcc/distcc/releases/download/v$version/$name-$version.tar.gz + distccd) build() { - #cd $name-$version - cd distcc-distcc-3.1 + cd $name-$version - ./autogen.sh +[ -e '/usr/lib/pkgconfig/python-3.7.pc' ] || PKGMK_DISTCC+=' --disable-pump-mode' +[ -e '/usr/lib/pkgconfig/gtk+-2.0.pc' ] || PKGMK_DISTCC+=' --without-gtk' +[ -e '/usr/lib/pkgconfig/popt.pc' ] || PKGMK_DISTCC+=' --with-included-popt' - patch -p 1 -i $SRC/distcc-3.1-freedesktop.patch - patch -p 1 -i $SRC/distcc-3.1-python.patch - patch -p 2 -i $SRC/distcc-3.1-argc-fix.patch + ./autogen.sh - ./configure \ + ./configure ${PKGMK_DISTCC} \ --prefix=/usr \ - --mandir=/usr/share/man \ - --without-gnome \ - --without-gtk \ - --disable-Werror \ - --with-included-popt + --sysconfdir=/etc \ + --enable-rfc2553 \ + --disable-Werror make make DESTDIR=$PKG install # distccd should be in sbin - install -d $PKG/usr/sbin mv $PKG/usr/bin/distccd $PKG/usr/sbin/distccd # install service @@ -49,11 +41,11 @@ build() { done cd - - rm -rf $PKG/usr/share/doc $PKG/usr/etc/default $PKG/usr/etc/distcc - rmdir $PKG/usr/etc + # cleanup + rm -r $PKG/usr/share/doc $PKG/etc/distcc $PKG/etc/default + rm $PKG//usr/sbin/update-distcc-symlinks # python is required for pump mode - if [ "$(prt-get isinst python)" = 'package python is not installed' ]; then - rm $PKG/usr/share/man/man1/{pump,include_server}.1 - fi +[ -e '/usr/lib/pkgconfig/python-3.7.pc' ] || \ + rm $PKG/usr/share/man/man1/{pump,include_server}.1.gz } diff --git a/distcc/distcc-3.1-argc-fix.patch b/distcc/distcc-3.1-argc-fix.patch deleted file mode 100644 index d7f30b55..00000000 --- a/distcc/distcc-3.1-argc-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -this fixes virtualbox not compiling with distcc - -https://bugs.gentoo.org/show_bug.cgi?id=351979 -http://code.google.com/p/distcc/issues/detail?id=83 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626926 - ---- distcc-3.1.orig/source/src/arg.c -+++ distcc-3.1/source/src/arg.c -@@ -515,6 +515,8 @@ - } - free(argv); - *argv_ptr = argv = new_argv; -+ i += extra_args - 1; -+ argc += extra_args - 1; - } - } - return 0; diff --git a/distcc/distcc-3.1-freedesktop.patch b/distcc/distcc-3.1-freedesktop.patch deleted file mode 100644 index b23db21a..00000000 --- a/distcc/distcc-3.1-freedesktop.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -Naur distcc-3.1.orig/Makefile.in distcc-3.1/Makefile.in ---- distcc-3.1.orig/Makefile.in 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/Makefile.in 2009-02-02 00:40:20.000000000 +0900 -@@ -49,13 +49,14 @@ - includedir = @includedir@ - oldincludedir = /usr/include - docdir = @docdir@ --pkgdatadir = $(datadir)/@PACKAGE_NAME@ -+icondir = $(datadir)/pixmaps -+desktopdir = $(datadir)/applications - - include_server_builddir = $(builddir)/_include_server - - # These must be done from here, not from autoconf, because they can - # contain variable expansions written in Make syntax. Ew. --DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" -+DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" - - # arguments to pkgconfig - GNOME_PACKAGES = @GNOME_PACKAGES@ -@@ -1003,7 +1004,8 @@ - @echo " documents $(DESTDIR)$(docdir)" - @echo " programs $(DESTDIR)$(bindir)" - @echo " system configuration $(DESTDIR)$(sysconfdir)" -- @echo " shared data files $(DESTDIR)$(pkgdatadir)" -+ @echo " icons $(DESTDIR)$(icondir)" -+ @echo " .desktop file $(DESTDIR)$(desktopdir)" - - - # install-sh can't handle multiple arguments, but we don't need any -@@ -1086,10 +1088,10 @@ - done - - install-gnome-data: $(gnome_data) -- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" -- for p in $(gnome_data); do \ -- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(icondir) -+ $(mkinstalldirs) $(DESTDIR)$(desktopdir) -+ $(INSTALL_DATA) gnome/distccmon-gnome-icon.png $(DESTDIR)$(icondir) -+ $(INSTALL_DATA) gnome/distccmon-gnome.desktop $(DESTDIR)$(desktopdir) - - install-conf: $(conf_files) $(default_files) - $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" -diff -Naur distcc-3.1.orig/gnome/distccmon-gnome.desktop distcc-3.1/gnome/distccmon-gnome.desktop ---- distcc-3.1.orig/gnome/distccmon-gnome.desktop 2008-12-03 06:50:27.000000000 +0900 -+++ distcc-3.1/gnome/distccmon-gnome.desktop 2009-02-02 00:40:55.000000000 +0900 -@@ -1,13 +1,11 @@ - [Desktop Entry] --Version=0.9.4 --Encoding=UTF-8 - Exec=distccmon-gnome - Name=distcc monitor - GenericName=Distributed Compile Monitor - Comment=Graphical view of distributed compile tasks --Icon=distccmon-gnome-icon.png -+Icon=distccmon-gnome-icon - TryExec=distccmon-gnome - Terminal=false - Type=Application --Categories=GNOME;Application;Development; -+Categories=GNOME;Development; - StartupNotify=true -diff -Naur distcc-3.1.orig/src/mon-gnome.c distcc-3.1/src/mon-gnome.c ---- distcc-3.1.orig/src/mon-gnome.c 2008-12-03 06:50:25.000000000 +0900 -+++ distcc-3.1/src/mon-gnome.c 2009-02-02 00:41:18.000000000 +0900 -@@ -599,7 +599,7 @@ - - #if GTK_CHECK_VERSION(2,2,0) - gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), -- PKGDATADIR "/distccmon-gnome-icon.png", -+ ICONDIR "/distccmon-gnome-icon.png", - NULL); - #endif - diff --git a/distcc/distcc-3.1-python.patch b/distcc/distcc-3.1-python.patch deleted file mode 100644 index 733357a5..00000000 --- a/distcc/distcc-3.1-python.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff -Naur distcc-3.1.orig/bench/statistics.py distcc-3.1/bench/statistics.py ---- distcc-3.1.orig/bench/statistics.py 2008-12-03 06:50:21.000000000 +0900 -+++ distcc-3.1/bench/statistics.py 2009-03-17 01:29:26.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python2.2 -+#! /usr/bin/env python - - # benchmark -- automated system for testing distcc correctness - # and performance on various source trees. -diff -Naur distcc-3.1.orig/configure distcc-3.1/configure ---- distcc-3.1.orig/configure 2008-12-03 06:50:34.000000000 +0900 -+++ distcc-3.1/configure 2009-03-17 01:31:09.000000000 +0900 -@@ -3629,7 +3629,7 @@ - # - # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present - # in autoconf 2.53. --for ac_prog in python2.5 python-2.5 python2.4 python-2.4 python -+for ac_prog in python - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -diff -Naur distcc-3.1.orig/configure.ac distcc-3.1/configure.ac ---- distcc-3.1.orig/configure.ac 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/configure.ac 2009-03-17 01:29:04.000000000 +0900 -@@ -243,7 +243,7 @@ - # - # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present - # in autoconf 2.53. --AC_PATH_PROGS(PYTHON, [python2.5 python-2.5 python2.4 python-2.4 python]) -+AC_PATH_PROGS(PYTHON, [python]) - AC_ARG_VAR(PYTHON, [Python interpreter]) - # Python 1 doesn't even support -V - if ! "$PYTHON" -V 2>&1 | grep "^Python" >/dev/null; then -diff -Naur distcc-3.1.orig/include_server/basics.py distcc-3.1/include_server/basics.py ---- distcc-3.1.orig/include_server/basics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/basics.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - # - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/basics_test.py distcc-3.1/include_server/basics_test.py ---- distcc-3.1.orig/include_server/basics_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/basics_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/c_extensions_test.py distcc-3.1/include_server/c_extensions_test.py ---- distcc-3.1.orig/include_server/c_extensions_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/c_extensions_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/cache_basics.py distcc-3.1/include_server/cache_basics.py ---- distcc-3.1.orig/include_server/cache_basics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/cache_basics.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/compiler_defaults.py distcc-3.1/include_server/compiler_defaults.py ---- distcc-3.1.orig/include_server/compiler_defaults.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/compiler_defaults.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/compress_files.py distcc-3.1/include_server/compress_files.py ---- distcc-3.1.orig/include_server/compress_files.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/compress_files.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer.py distcc-3.1/include_server/include_analyzer.py ---- distcc-3.1.orig/include_server/include_analyzer.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer_memoizing_node.py distcc-3.1/include_server/include_analyzer_memoizing_node.py ---- distcc-3.1.orig/include_server/include_analyzer_memoizing_node.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer_memoizing_node.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer_memoizing_node_test.py distcc-3.1/include_server/include_analyzer_memoizing_node_test.py ---- distcc-3.1.orig/include_server/include_analyzer_memoizing_node_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer_memoizing_node_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer_test.py distcc-3.1/include_server/include_analyzer_test.py ---- distcc-3.1.orig/include_server/include_analyzer_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_server.py distcc-3.1/include_server/include_server.py ---- distcc-3.1.orig/include_server/include_server.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_server.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_server_test.py distcc-3.1/include_server/include_server_test.py ---- distcc-3.1.orig/include_server/include_server_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_server_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/macro_eval.py distcc-3.1/include_server/macro_eval.py ---- distcc-3.1.orig/include_server/macro_eval.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/macro_eval.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/macro_eval_test.py distcc-3.1/include_server/macro_eval_test.py ---- distcc-3.1.orig/include_server/macro_eval_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/macro_eval_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/mirror_path.py distcc-3.1/include_server/mirror_path.py ---- distcc-3.1.orig/include_server/mirror_path.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/mirror_path.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/mirror_path_test.py distcc-3.1/include_server/mirror_path_test.py ---- distcc-3.1.orig/include_server/mirror_path_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/mirror_path_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_command.py distcc-3.1/include_server/parse_command.py ---- distcc-3.1.orig/include_server/parse_command.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_command.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_command_test.py distcc-3.1/include_server/parse_command_test.py ---- distcc-3.1.orig/include_server/parse_command_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_command_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_file.py distcc-3.1/include_server/parse_file.py ---- distcc-3.1.orig/include_server/parse_file.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_file.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_file_test.py distcc-3.1/include_server/parse_file_test.py ---- distcc-3.1.orig/include_server/parse_file_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_file_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/run.py distcc-3.1/include_server/run.py ---- distcc-3.1.orig/include_server/run.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/run.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/setup.py distcc-3.1/include_server/setup.py ---- distcc-3.1.orig/include_server/setup.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/setup.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/statistics.py distcc-3.1/include_server/statistics.py ---- distcc-3.1.orig/include_server/statistics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/statistics.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - # - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/test/onetest.py distcc-3.1/test/onetest.py ---- distcc-3.1.orig/test/onetest.py 2008-12-03 06:50:22.000000000 +0900 -+++ distcc-3.1/test/onetest.py 2009-03-17 01:29:44.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - # - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/test/testdistcc.py distcc-3.1/test/testdistcc.py ---- distcc-3.1.orig/test/testdistcc.py 2008-12-03 06:50:22.000000000 +0900 -+++ distcc-3.1/test/testdistcc.py 2009-03-17 01:29:36.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python2.2 -+#! /usr/bin/env python - - # Copyright (C) 2002, 2003, 2004 by Martin Pool <mbp(a)samba.org> - # Copyright 2007 Google Inc.

1 0