February 2020 - crux-commits

ports/contrib (3.5): p5-term-readkey: 2.37 -> 2.38
by crux＠crux.nu 01 Feb '20

01 Feb '20

commit bdeff9637d9b7f075580f06b8742776987423835 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 1 21:33:11 2020 +1100 p5-term-readkey: 2.37 -> 2.38 diff --git a/p5-term-readkey/.signature b/p5-term-readkey/.signature index 7e4e25385..f58a7554c 100644 --- a/p5-term-readkey/.signature +++ b/p5-term-readkey/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39o5BNgQG3OYbrmbpJm5GckyuKeiFcKBjoE7pVO6ZzCJ0wCuMwnjzUYFbNx7I2+WvcY6uUuoUo4SMB3th/nS4QQ= -SHA256 (Pkgfile) = bc647394fd48b7e94ff08cf7b61cade9f503f1d21f994051f9b297221b90fdc0 +RWSagIOpLGJF321zO2zuBou6pqvbAY8tpf6gonKbmWYPuEpGTFvhcwnj8iuZiCyPwbIFHBLJMpMuxDCi7l12VMUCD6BHtd0MSgg= +SHA256 (Pkgfile) = 6e9457d27b53dcdd397c7a9de788766500af218dbcec2be4c54355d97de86e2a SHA256 (.footprint) = 49087f18133adb371acfe4b409240dac2ff4f49400abe6f3420786377fed61b5 -SHA256 (TermReadKey-2.37.tar.gz) = 4a9383cf2e0e0194668fe2bd546e894ffad41d556b41d2f2f577c8db682db241 +SHA256 (TermReadKey-2.38.tar.gz) = 5a645878dc570ac33661581fbb090ff24ebce17d43ea53fd22e105a856a47290 diff --git a/p5-term-readkey/Pkgfile b/p5-term-readkey/Pkgfile index 6c3935cf1..01b6d38f2 100644 --- a/p5-term-readkey/Pkgfile +++ b/p5-term-readkey/Pkgfile @@ -1,9 +1,9 @@ # Description: Perl Terminal Readkey Library. -# URL: http://search.cpan.org/~jstowe/TermReadKey/ +# URL: https://metacpan.org/release/TermReadKey # Maintainer: Danny Rawlins, crux at romster dot me name=p5-term-readkey -version=2.37 +version=2.38 release=1 source=(https://cpan.metacpan.org/authors/id/J/JS/JSTOWE/TermReadKey-$versi…

1 0

ports/contrib (3.5): p5-net-ssleay: 1.85 -> 1.88
by crux＠crux.nu 01 Feb '20

01 Feb '20

commit adcd60e73ee4707842489e926faa48d322aab331 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 1 21:32:52 2020 +1100 p5-net-ssleay: 1.85 -> 1.88 diff --git a/p5-net-ssleay/.signature b/p5-net-ssleay/.signature index b7424c5c8..d3b8ce884 100644 --- a/p5-net-ssleay/.signature +++ b/p5-net-ssleay/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38cZiwaBg/Zs03DSDv4NiXP+P3aZgzrWhRvG05mzp+ELvKc9tZX5r5Bhh6ZdRYs6pr+wEOrJZFDm4CIENr+kGAc= -SHA256 (Pkgfile) = 21027220c61a985bfab5a34a88fc303ea795541ce9a1e93ddb611c02cff1c8c4 +RWSagIOpLGJF3wcapW080tZ4Z4ePikaxELUwXoMb03dkwizlUsFFJYb5Jm2dwGMdZisDPzGuppMQxeU1QK2n6hj3KjXT16ardgo= +SHA256 (Pkgfile) = 8e7715c59e448c417b8571449e82184e9a8b664183c11877244a7d21f9fd154c SHA256 (.footprint) = 09c67bab7690bc15d713481851541d33432f8f1075bc605a05711dad245e1f05 -SHA256 (Net-SSLeay-1.85.tar.gz) = 9d8188b9fb1cae3bd791979c20554925d5e94a138d00414f1a6814549927b0c8 +SHA256 (Net-SSLeay-1.88.tar.gz) = 2000da483c8471a0b61e06959e92a6fca7b9e40586d5c828de977d3d2081cfdd diff --git a/p5-net-ssleay/Pkgfile b/p5-net-ssleay/Pkgfile index 692ae220a..7d43005de 100644 --- a/p5-net-ssleay/Pkgfile +++ b/p5-net-ssleay/Pkgfile @@ -1,16 +1,19 @@ # Description: Perl extension for using OpenSSL. -# URL: http://search.cpan.org/dist/Net-SSLeay/ +# URL: https://metacpan.org/release/Net-SSLeay # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: openssl name=p5-net-ssleay -version=1.85 +version=1.88 +_realname=Net-SSLeay +_author=CHRISN release=1 -source=(https://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-$version.tar.gz) +source=(https://cpan.metacpan.org/authors/id/${_author::1}/${_author::2}/$_author/$_realname-$version.tar.gz) build() { - cd Net-SSLeay-$version - echo y | perl Makefile.PL + cd $_realname-$version + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make OPTIMIZE="$CFLAGS" make DESTDIR=$PKG install

1 0

ports/contrib (3.5): p5-ipc-system-simple: 1.25 -> 1.26
by crux＠crux.nu 01 Feb '20

01 Feb '20

commit fab1d561998faa0d49b2333b499a3a5ca1b63c4e Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 1 21:32:34 2020 +1100 p5-ipc-system-simple: 1.25 -> 1.26 diff --git a/p5-ipc-system-simple/.signature b/p5-ipc-system-simple/.signature index 92c673ef5..754624b7c 100644 --- a/p5-ipc-system-simple/.signature +++ b/p5-ipc-system-simple/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36gGgU0dKeID03WZpyUphdUdkseM90bRK+4g2FZklxbyZTo03UKf69F+AihYsVPRpFZaBrYAbTtak1j5tYfaPAg= -SHA256 (Pkgfile) = e10b9fe9f2cefff2f57cbdfc7990d0778b7bd9179f4cc50986280cdb614f33ef +RWSagIOpLGJF3wmGeh76LeZ09LmpWyiw2F4XePpFbUu+Gp302DSqzY0EfLF0jomPEKVf+ECp0ADxmTzwO+h0m7H6lf/A/tef1wU= +SHA256 (Pkgfile) = 572548438536b0b23166194174d2554b3060e54ab5bec96bd8867662a940fd0b SHA256 (.footprint) = e4c36eb1297503c6f3c429bdfed6496f0422949d21aa6c73bbd104f83bc05e54 -SHA256 (IPC-System-Simple-1.25.tar.gz) = f1b6aa1dfab886e8e4ea825f46a1cbb26038ef3e727fef5d84444aa8035a4d3b +SHA256 (IPC-System-Simple-1.26.tar.gz) = 57177f21d8e8625bba32ea454f10a1fda16f93c1baf1aa80d106ab1951b465fd diff --git a/p5-ipc-system-simple/Pkgfile b/p5-ipc-system-simple/Pkgfile index 456d58dc6..e96ae1827 100644 --- a/p5-ipc-system-simple/Pkgfile +++ b/p5-ipc-system-simple/Pkgfile @@ -4,8 +4,8 @@ name=p5-ipc-system-simple _realname=IPC-System-Simple -_author=PJF -version=1.25 +_author=JKEENAN +version=1.26 release=1 source=(https://cpan.metacpan.org/authors/id/${_author::1}/${_author::2}/$_…

1 0

ports/contrib (3.5): p5-io-socket-ssl: 2.060 -> 2.066
by crux＠crux.nu 01 Feb '20

01 Feb '20

commit 4b509acdca48938c7aa23d092187fa02008694c6 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 1 21:32:09 2020 +1100 p5-io-socket-ssl: 2.060 -> 2.066 diff --git a/p5-io-socket-ssl/.signature b/p5-io-socket-ssl/.signature index fcde71b44..09941dc80 100644 --- a/p5-io-socket-ssl/.signature +++ b/p5-io-socket-ssl/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32lK71zE7Hh0TVTSUhuc0mIn8sbjj0W2mnc2gzNHaf6BHxcB4XVB4UYexuopKFBUXKMgObR/LfrqBLVvxgjN7QY= -SHA256 (Pkgfile) = 87b7c47ec6eac0b52e54e55235e70fd05a639ccbe74567b65b0449f79bf36054 +RWSagIOpLGJF32BKNK93xiZZTBXeonYg+hR1pHdg+/FY9BpKiIB0zTVFXGAzJ2bOFAtvqhLFNylUtTS38aKLc3WuE33veBIrGw0= +SHA256 (Pkgfile) = 943815953450bb4e2a92378ee8a6830a186aec5d7b39f9dba4109caadc6961f3 SHA256 (.footprint) = d39f1ed9c2f77092927b861034e5133822d10b41e8766d6acf6fb7ddc5357a40 -SHA256 (IO-Socket-SSL-2.060.tar.gz) = fb5b2877ac5b686a5d7b8dd71cf5464ffe75d10c32047b5570674870e46b1b8c +SHA256 (IO-Socket-SSL-2.066.tar.gz) = 0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd diff --git a/p5-io-socket-ssl/Pkgfile b/p5-io-socket-ssl/Pkgfile index 373faf475..110036f21 100644 --- a/p5-io-socket-ssl/Pkgfile +++ b/p5-io-socket-ssl/Pkgfile @@ -4,7 +4,7 @@ # Depends on: p5-net-ssleay p5-uri name=p5-io-socket-ssl -version=2.060 +version=2.066 release=1 source=(https://www.cpan.org/modules/by-module/IO/IO-Socket-SSL-$version.ta…

1 0

ports/contrib (3.5): p5-file-slurp: 9999.28 -> 9999.29
by crux＠crux.nu 01 Feb '20

01 Feb '20

commit 050ad5e9543f51b8c9528af4fbaca7c9f88c914c Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 1 21:31:45 2020 +1100 p5-file-slurp: 9999.28 -> 9999.29 diff --git a/p5-file-slurp/.footprint b/p5-file-slurp/.footprint index 3b90e858c..911931a1e 100644 --- a/p5-file-slurp/.footprint +++ b/p5-file-slurp/.footprint @@ -4,7 +4,7 @@ drwxr-xr-x root/root usr/lib/perl5/ drwxr-xr-x root/root usr/lib/perl5/site_perl/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.28/File/ --r--r--r-- root/root usr/lib/perl5/site_perl/5.28/File/Slurp.pm +-r-xr-xr-x root/root usr/lib/perl5/site_perl/5.28/File/Slurp.pm drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man3/ diff --git a/p5-file-slurp/.signature b/p5-file-slurp/.signature index 668e27609..38144b6b1 100644 --- a/p5-file-slurp/.signature +++ b/p5-file-slurp/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF368OR7hw8+0e/xFZ2Xn8VoxNsfLoX7yxDAnUhQ4PPv2Dj++vn8ER2rjsyeijsIdbzz5C4rvf4yAl3Z7tmWUgKAU= -SHA256 (Pkgfile) = 25eef913cd14dcbe4bc3225591a7b05599fbea9733aa504c8357a2585a5620ab -SHA256 (.footprint) = 335b10546cb1f8b6a70bb83ff736852d0f93040d68effc7ac223cdbaf19cf755 -SHA256 (File-Slurp-9999.28.tar.gz) = 0587ce010bcb79db9e744f14b5498be97bf2c7f2474d971916d92f0a10827cee +RWSagIOpLGJF3wzXnB4k8m3ho4OPmFfcfPeqlzwmpl0LgMJMmF0fSm6DqPC+nwuD1yv9mBzd8Si/uK8Cbww0A0Sz3UhEi5wmBw0= +SHA256 (Pkgfile) = fac62780da0c9f55f48589892415cf10bce429f1e073c2303d370209bffc5850 +SHA256 (.footprint) = 869f0aac09a10eacf073b84de93fcaf075138ae67122288279ff18f09cd90f13 +SHA256 (File-Slurp-9999.29.tar.gz) = 0e6e47e0bba639e37e51fdc7a43b187cd90ac642e4baa13a7185bc6c223e19c7 diff --git a/p5-file-slurp/Pkgfile b/p5-file-slurp/Pkgfile index 880c4e475..d4efdc7f5 100644 --- a/p5-file-slurp/Pkgfile +++ b/p5-file-slurp/Pkgfile @@ -5,7 +5,7 @@ name=p5-file-slurp _realname=File-Slurp _author=CAPOEIRAB -version=9999.28 +version=9999.29 release=1 source=(https://cpan.metacpan.org/authors/id/${_author::1}/${_author::2}/$_…

1 0

ports/contrib (3.5): mkvtoolnix: 42.0.0 -> 43.0.0
by crux＠crux.nu 01 Feb '20

01 Feb '20

commit 13753b0e33783de056fd4cb2fb4c3dc832aa7bd5 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 1 18:40:02 2020 +1100 mkvtoolnix: 42.0.0 -> 43.0.0 diff --git a/mkvtoolnix/.signature b/mkvtoolnix/.signature index 32fc2e452..ea4593b10 100644 --- a/mkvtoolnix/.signature +++ b/mkvtoolnix/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36tysUUXQe8Kym3M6fSX3llbocs7A3nBlTcxR2a2+NkhPx6WWyxvPh1qJhYzwp4g4sV/vRegctj5nFKizCQ0zQI= -SHA256 (Pkgfile) = 4c1fafdf271d4ef426fe25fa75dfd165b9a2f1367f036c788e9bcbb44a86a3b6 +RWSagIOpLGJF32IsA+iWzZuD3YFSQw7I3Py+jq8P5bhkCJkYNrSu7qvVTyp7WLQoE7ZPs86iQDKrVMO7gi+tAR2hEsBkIVGjdww= +SHA256 (Pkgfile) = 9c6fa887195456371500297d6655cb72e85a4c1d40d94f79efc25acbf293ba88 SHA256 (.footprint) = d9f866a4dfc3083dcd50f41597aef384052b792a8dd6005d4aef83ff4bdbe4ac -SHA256 (mkvtoolnix-42.0.0.tar.xz) = 2c8215c22a3a75925c0f1568235fbe2e34172021e43fb45081400b7c6b610033 +SHA256 (mkvtoolnix-43.0.0.tar.xz) = 5acfda67817c17702c35e14c2acd78340f608d154842a791ea17fd38835910b6 diff --git a/mkvtoolnix/Pkgfile b/mkvtoolnix/Pkgfile index 0781254f1..f5e0c9ca4 100644 --- a/mkvtoolnix/Pkgfile +++ b/mkvtoolnix/Pkgfile @@ -5,7 +5,7 @@ # Optional: qt5 hicolor-icon-theme name=mkvtoolnix -version=42.0.0 +version=43.0.0 release=1 source=(https://mkvtoolnix.download/sources/$name-$version.tar.xz)

1 0

ports/contrib (3.5): inkscape: poppler rebuild
by crux＠crux.nu 01 Feb '20

01 Feb '20

commit 7e9f180c2be73ce50ce1fb530e11fbe1d3621dfe Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 1 18:38:43 2020 +1100 inkscape: poppler rebuild diff --git a/inkscape/.footprint b/inkscape/.footprint index 9c5e21ce2..c82f48be8 100644 --- a/inkscape/.footprint +++ b/inkscape/.footprint @@ -3,7 +3,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/inkscape -rwxr-xr-x root/root usr/bin/inkview drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libpoppler.so.92 +-rwxr-xr-x root/root usr/lib/libpoppler.so.95 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/appdata/ -rw-r--r-- root/root usr/share/appdata/inkscape.appdata.xml diff --git a/inkscape/.signature b/inkscape/.signature index fdceb2df5..5ab3cf612 100644 --- a/inkscape/.signature +++ b/inkscape/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xO3mkq6GAVQA3D3Auv24u4Ohg/t32+yxV3Rqpv6mV+0l8nI2RPjKVgZIBUQR1VCQHMGchalyTpqLKbNHhuflwA= -SHA256 (Pkgfile) = 5ddcc664da2ca044bb3c18f327e1c1397c199f811c7f70da5a8048f769679379 -SHA256 (.footprint) = 795147c6b14f9a6ca03cf99ac16bbef4145331c7c5d0472eabb805215507f6a6 +RWSagIOpLGJF35eIMLi8vam0hL0y6E2gIHcYJnmCudbi45d7p6ITVZwzwVDGEHstBNx2fzCs6Pu5o/VJiC2jCuDB2yAkrGu9cwE= +SHA256 (Pkgfile) = 5fc280e2b2e46c51d38884267ad00fddf67b7a6bbbd5c5dbaff258d2f781f8c0 +SHA256 (.footprint) = 51f3fc24d9125a92681790957a90cfe5026847213ded06c84828a9835f9e4c7c SHA256 (inkscape-0.92.4.tar.bz2) = 57ec2da8177b36614a513e2822efd73af721e690f7ddc6bd0a5fbb1525b4515e -SHA256 (poppler-0.82.0.tar.xz) = 234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df -SHA256 (inkscape-0.92.4-poppler_0_82_0_fixes-1.patch) = 0c35bc0be8d681531233b43123c11bd6d375e8d780b9b78b5ca018c6ae61484e +SHA256 (poppler-0.85.0.tar.xz) = 2bc875eb323002ae6b287e09980473518e2b2ed6b5b7d2e1089e36a6cd00d94b +SHA256 (inkscape-0.92.4-poppler_0_83_0_fixes-1.patch) = 0b8d8e8915af3a50ee4c19e1dc954aa9c21171c90aa8e3d439cfe3f44fdf1eb8 SHA256 (inkscape-0.92.4-use_versioned_ImageMagick6-1.patch) = 7f0e401e359285590f545c1b1225ec98682922d2f82e805c722c2f086be28c4c SHA256 (inkscape-0.92.4-upstream_fixes-1.patch) = 6932d7f140ba0ee4992bdea165f94854a3114d9eac190b7003b18af7f6cf7341 diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile index e4d48eafb..f7f75a4fa 100644 --- a/inkscape/Pkgfile +++ b/inkscape/Pkgfile @@ -6,17 +6,17 @@ name=inkscape version=0.92.4 -release=3 +release=4 source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.bz2 - https://poppler.freedesktop.org/poppler-0.82.0.tar.xz - inkscape-0.92.4-poppler_0_82_0_fixes-1.patch + https://poppler.freedesktop.org/poppler-0.85.0.tar.xz + inkscape-0.92.4-poppler_0_83_0_fixes-1.patch inkscape-0.92.4-use_versioned_ImageMagick6-1.patch inkscape-0.92.4-upstream_fixes-1.patch) poppler() { #-boehm-gc boost gsl gtkmm poppler-glib popt #+cmake cairo lcms2 boehm-gc boost gsl gtkmm popt - cd poppler-0.82.0 + cd poppler-0.85.0 cmake . \ -DCMAKE_INSTALL_PREFIX=$SRC/poppler \ -DCMAKE_INSTALL_LIBDIR=$SRC/poppler/lib \ @@ -34,7 +34,7 @@ poppler() { make make install - install -D -t $PKG/usr/lib/ $SRC/poppler/lib/libpoppler.so.92 + install -D -t $PKG/usr/lib/ $SRC/poppler/lib/libpoppler.so.95 export CXXFLAGS+=" -I$SRC/poppler/include -I$SRC/poppler/include/poppler" export PKG_CONFIG_PATH="$SRC/poppler/lib/pkgconfig:$PKG_CONFIG_PATH" @@ -48,7 +48,10 @@ build() { # fix a problem introduced by Poppler-0.76.1 sed -e 's|new Lexer(xref, obj)|obj|g' -i src/extension/internal/pdfinput/pdf-parser.cpp - patch -p1 -i $SRC/inkscape-0.92.4-poppler_0_82_0_fixes-1.patch + # fix Inkscape to be able to build with poppler-0.82.0 and higher + sed -e 's|Unicode \*u|Unicode const *u|g' -i src/extension/internal/pdfinput/* + + patch -p1 -i $SRC/inkscape-0.92.4-poppler_0_83_0_fixes-1.patch patch -p1 -i $SRC/inkscape-0.92.4-use_versioned_ImageMagick6-1.patch patch -p1 -i $SRC/inkscape-0.92.4-upstream_fixes-1.patch diff --git a/inkscape/inkscape-0.92.4-poppler_0_82_0_fixes-1.patch b/inkscape/inkscape-0.92.4-poppler_0_82_0_fixes-1.patch deleted file mode 100644 index 61c568eac..000000000 --- a/inkscape/inkscape-0.92.4-poppler_0_82_0_fixes-1.patch +++ /dev/null @@ -1,63 +0,0 @@ -Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org> -Date: 2019-10-28 -Initial Package Version: 0.92.4 -Origin: Upstream (https://gitlab.com/inkscape/inkscape/merge_requests/986) -Upstream Status: Applied -Description: Adjusts the usage of the poppler-glib API to use a - const int instead of a standard int, since the - data types are incompatible and causes a build failure. - This required modification to the SVG Builder and - PDF Parser. - -diff -Naurp inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp ---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2019-01-14 22:29:27.000000000 -0600 -+++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp 2019-10-28 09:54:48.488255747 -0500 -@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) - int wMode; - double riseX, riseY; - CharCode code; -- Unicode *u = NULL; -+ Unicode _POPPLER_CONST_82 *u = NULL; - double x, y, dx, dy, tdx, tdy; - double originX, originY, tOriginX, tOriginY; - double oldCTM[6], newCTM[6]; -diff -Naurp inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h ---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h 2019-01-14 22:29:27.000000000 -0600 -+++ inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h 2019-10-28 09:55:37.586507369 -0500 -@@ -3,6 +3,12 @@ - - #include <glib/poppler-features.h> - -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+#define _POPPLER_CONST_82 const -+#else -+#define _POPPLER_CONST_82 -+#endif -+ - #if POPPLER_CHECK_VERSION(0, 72, 0) - #define getCString c_str - #endif -diff -Naurp inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp ---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp 2019-01-14 22:29:27.000000000 -0600 -+++ inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp 2019-10-28 09:56:03.815112158 -0500 -@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *s - void SvgBuilder::addChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, -- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) { -+ CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) { - - - bool is_space = ( uLen == 1 && u[0] == 32 ); -diff -Naurp inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.h inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.h ---- inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.h 2019-01-14 22:29:27.000000000 -0600 -+++ inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.h 2019-10-28 09:56:25.743784036 -0500 -@@ -141,7 +141,7 @@ public: - void addChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, -- CharCode code, int nBytes, Unicode *u, int uLen); -+ CharCode code, int nBytes, Unicode const *u, int uLen); - void beginTextObject(GfxState *state); - void endTextObject(GfxState *state); - diff --git a/inkscape/inkscape-0.92.4-poppler_0_83_0_fixes-1.patch b/inkscape/inkscape-0.92.4-poppler_0_83_0_fixes-1.patch new file mode 100644 index 000000000..30a551e98 --- /dev/null +++ b/inkscape/inkscape-0.92.4-poppler_0_83_0_fixes-1.patch @@ -0,0 +1,90 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2019-12-03 +Initial Package Version: 0.92.4 +Upstream Status: Applied, commit 51351358a62a +Origin: Jan Tojnar +Description: Fixes for poppler-0.83.0. + +To fix earlier changes made for poppler 0.82.0 without pulling +in a load of other things, this also needs a sed found at Arch: + +sed -e 's|Unicode \*u|Unicode const *u|g' -i src/extension/internal/pdfinput/* + +diff -Naur a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp +--- a/src/extension/internal/pdfinput/pdf-input.cpp 2019-01-15 04:29:27.000000000 +0000 ++++ b/src/extension/internal/pdfinput/pdf-input.cpp 2019-12-03 13:24:09.800623725 +0000 +@@ -689,12 +689,12 @@ + // + gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR"); + if (poppler_datadir != NULL) { +- globalParams = new GlobalParams(poppler_datadir); ++ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir); + } else { +- globalParams = new GlobalParams(); ++ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(); + } + #else +- globalParams = new GlobalParams(); ++ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(); + #endif // ENABLE_OSX_APP_LOCATIONS + } + +diff -Naur a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +--- a/src/extension/internal/pdfinput/pdf-parser.cpp 2019-01-15 04:29:27.000000000 +0000 ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp 2019-12-03 13:25:45.431129854 +0000 +@@ -272,7 +272,7 @@ + ClipHistoryEntry *save(); + ClipHistoryEntry *restore(); + GBool hasSaves() { return saved != NULL; } +- void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal); ++ void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType newClipType = clipNormal); + GfxPath *getClipPath() { return clipPath; } + GfxClipType getClipType() { return clipType; } + +@@ -3394,7 +3394,7 @@ + } + } + +-void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) { ++void ClipHistoryEntry::setClip(_POPPLER_CONST_83 GfxPath *clipPathA, GfxClipType clipTypeA) { + // Free previous clip path + if (clipPath) { + delete clipPath; +diff -Naur a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +--- a/src/extension/internal/pdfinput/poppler-transition-api.h 2019-01-15 04:29:27.000000000 +0000 ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h 2019-12-03 13:29:10.319199158 +0000 +@@ -3,6 +3,18 @@ + + #include <glib/poppler-features.h> + ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++#define _POPPLER_CONST_83 const ++#else ++#define _POPPLER_CONST_83 ++#endif ++ ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++#define _POPPLER_NEW_GLOBAL_PARAMS(args...) std::unique_ptr<GlobalParams>(new GlobalParams(args)) ++#else ++#define _POPPLER_NEW_GLOBAL_PARAMS(args...) new GlobalParams(args) ++#endif ++ + #if POPPLER_CHECK_VERSION(0, 72, 0) + #define getCString c_str + #endif +diff -Naur a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp +--- a/src/extension/internal/pdfinput/svg-builder.cpp 2019-01-15 04:29:27.000000000 +0000 ++++ b/src/extension/internal/pdfinput/svg-builder.cpp 2019-12-03 13:24:09.801623720 +0000 +@@ -264,10 +264,10 @@ + /** + * \brief Generates a SVG path string from poppler's data structure + */ +-static gchar *svgInterpretPath(GfxPath *path) { ++static gchar *svgInterpretPath(_POPPLER_CONST_83 GfxPath *path) { + Inkscape::SVG::PathString pathString; + for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) { +- GfxSubpath *subpath = path->getSubpath(i); ++ _POPPLER_CONST_83 GfxSubpath *subpath = path->getSubpath(i); + if (subpath->getNumPoints() > 0) { + pathString.moveTo(subpath->getX(0), subpath->getY(0)); + int j = 1;

1 0

ports/contrib (3.5): imagemagick-compat: 6.9.10-84 -> 6.9.10-90
by crux＠crux.nu 01 Feb '20

01 Feb '20

commit 79ec591e2c30dd9869d940cf69b4adf7c19c1f04 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 1 18:36:58 2020 +1100 imagemagick-compat: 6.9.10-84 -> 6.9.10-90 diff --git a/imagemagick-compat/.footprint b/imagemagick-compat/.footprint index 126b5d3d2..c9fa7dad3 100644 --- a/imagemagick-compat/.footprint +++ b/imagemagick-compat/.footprint @@ -130,6 +130,7 @@ drwxr-xr-x root/root usr/include/ImageMagick-6/magick/ -rw-r--r-- root/root usr/include/ImageMagick-6/magick/utility.h -rw-r--r-- root/root usr/include/ImageMagick-6/magick/version.h -rw-r--r-- root/root usr/include/ImageMagick-6/magick/vision.h +-rw-r--r-- root/root usr/include/ImageMagick-6/magick/visual-effects.h -rw-r--r-- root/root usr/include/ImageMagick-6/magick/widget.h -rw-r--r-- root/root usr/include/ImageMagick-6/magick/xml-tree.h -rw-r--r-- root/root usr/include/ImageMagick-6/magick/xwindow.h diff --git a/imagemagick-compat/.signature b/imagemagick-compat/.signature index cd3fa99c0..322178acf 100644 --- a/imagemagick-compat/.signature +++ b/imagemagick-compat/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36ROeAfl5en/LKLJNT5/qIRafuJRyzE4zb7Mg/t9t/ivHMOEaUpsdewzFlYemIFOYERs4J+WenNcubQS/6TQqgk= -SHA256 (Pkgfile) = 2d30606e43fe561d88b9ac815ed142783dc03a4150197e5d60f4f543f03e1e10 -SHA256 (.footprint) = aad852c7db32cf45ba74fec023581f45ab64301ffa65ace721c0332111410188 -SHA256 (ImageMagick-6.9.10-84.tar.xz) = 42c506071219024aae9a75baf9c12699dffa45885a1d3c3062a8b2368d0f67f4 +RWSagIOpLGJF3/pG9GMCyiv0Y1ZoIvPDAxRW3L48eRvoeGhQBdnL1tt8kDj1LtCy4rQr6VPr61EKME11pUW59+bBiBHOQ8mkxAo= +SHA256 (Pkgfile) = bfed420308b9c23f08ca8afe7ef14047a920501fe7a91bbe715aa62470c9106f +SHA256 (.footprint) = c8c6c83fd7114e9c0c42d382a2e3787fbbf9211a503daad4d07d9a5337d30177 +SHA256 (ImageMagick-6.9.10-90.tar.xz) = c88fd84a1fce4853fe5c14260d118419a5f2bf9160ba704e9c2aa494a3a9d0d6 SHA256 (IM6-GS-policy.patch) = f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6 diff --git a/imagemagick-compat/Pkgfile b/imagemagick-compat/Pkgfile index 93d0ae6e9..44b82a8b9 100644 --- a/imagemagick-compat/Pkgfile +++ b/imagemagick-compat/Pkgfile @@ -4,7 +4,7 @@ # Depends on: lcms2 pango xorg-libxt name=imagemagick-compat -version=6.9.10-84 +version=6.9.10-90 release=1 source=(https://www.imagemagick.org/download/ImageMagick-$version.tar.xz IM6-GS-policy.patch)

1 0

ports/contrib (3.5): python3-lxml: 4.4.2 -> 4.5.0
by crux＠crux.nu 01 Feb '20

01 Feb '20

commit 89f9e82f8abef3fa6809da936636a0221d112763 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 1 17:32:51 2020 +1100 python3-lxml: 4.4.2 -> 4.5.0 diff --git a/python3-lxml/.footprint b/python3-lxml/.footprint index 4a84dd396..7991b9d21 100644 --- a/python3-lxml/.footprint +++ b/python3-lxml/.footprint @@ -2,13 +2,13 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.7/ drwxr-xr-x root/root usr/lib/python3.7/site-packages/ -drwxr-xr-x root/root usr/lib/python3.7/site-packages/lxml-4.4.2-py3.7.egg-info/ --rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml-4.4.2-py3.7.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml-4.4.2-py3.7.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml-4.4.2-py3.7.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml-4.4.2-py3.7.egg-info/not-zip-safe --rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml-4.4.2-py3.7.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml-4.4.2-py3.7.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.7/site-packages/lxml-4.5.0-py3.7.egg-info/ +-rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml-4.5.0-py3.7.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml-4.5.0-py3.7.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml-4.5.0-py3.7.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml-4.5.0-py3.7.egg-info/not-zip-safe +-rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml-4.5.0-py3.7.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml-4.5.0-py3.7.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.7/site-packages/lxml/ -rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml/ElementInclude.py -rw-r--r-- root/root usr/lib/python3.7/site-packages/lxml/__init__.py diff --git a/python3-lxml/.signature b/python3-lxml/.signature index 0b0f2b261..57b9722df 100644 --- a/python3-lxml/.signature +++ b/python3-lxml/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+8PuFB4I8mCNoKpCGO/5VlpSVcrLuL+DhvWLm54IS8NuOF1ZdsilVlclngbqqGbV88MddaxkjxnoQatGgZE3wE= -SHA256 (Pkgfile) = b6c7d0c2014672ae738422851b4dd93a3d0946426b56880354aab76231128f31 -SHA256 (.footprint) = b9c581da7441e35747326fe5cbd141ec90cb1bb38fc4c022686ca2654079b2eb -SHA256 (lxml-4.4.2.tgz) = eff69ddbf3ad86375c344339371168640951c302450c5d3e9936e98d6459db06 +RWSagIOpLGJF3xhFVy2rZpDvIa2d0q7ZMqJKNamEMhHWll0qbutH7BodQt8Zp+vzBPaUyISwLA9rlqTATkUE24C0xRavu2B29gw= +SHA256 (Pkgfile) = 775d86922ed0c5812f76770a1d8d9e81b8dbf9b4739986e263b09dc59652a2f6 +SHA256 (.footprint) = 5b0bcdd65b918d56d9f40cfd4d2d6d7aec9a2e4e45c672ef51e910608d3dd5cc +SHA256 (lxml-4.5.0.tgz) = 8620ce80f50d023d414183bf90cc2576c2837b88e00bea3f33ad2630133bbb60 diff --git a/python3-lxml/Pkgfile b/python3-lxml/Pkgfile index a2fb038e9..5dfb591fa 100644 --- a/python3-lxml/Pkgfile +++ b/python3-lxml/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3-beautifulsoup4 python3-cssselect python3-cython python3-html5lib libxslt name=python3-lxml -version=4.4.2 +version=4.5.0 release=1 source=(https://lxml.de/files/${name#*-}-$version.tgz)

1 0

ports/contrib (3.5): python-lxml: 4.4.2 -> 4.5.0
by crux＠crux.nu 01 Feb '20

01 Feb '20

commit c7a71fe354d3654169a4aedd566ce866486ea8d5 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Feb 1 17:29:54 2020 +1100 python-lxml: 4.4.2 -> 4.5.0 diff --git a/python-lxml/.footprint b/python-lxml/.footprint index fac08e333..b3ad347ff 100644 --- a/python-lxml/.footprint +++ b/python-lxml/.footprint @@ -2,13 +2,13 @@ drwxr-xr-x root/root usr/ 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/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml-4.4.2-py2.7.egg-info/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.4.2-py2.7.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.4.2-py2.7.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.4.2-py2.7.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.4.2-py2.7.egg-info/not-zip-safe --rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.4.2-py2.7.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.4.2-py2.7.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml-4.5.0-py2.7.egg-info/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.5.0-py2.7.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.5.0-py2.7.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.5.0-py2.7.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.5.0-py2.7.egg-info/not-zip-safe +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.5.0-py2.7.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml-4.5.0-py2.7.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python2.7/site-packages/lxml/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/ElementInclude.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/lxml/ElementInclude.pyc diff --git a/python-lxml/.signature b/python-lxml/.signature index 358d770ea..2861cf195 100644 --- a/python-lxml/.signature +++ b/python-lxml/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37eqhHQvy5YR2pVJ8LwSzFiGvk1s9H3auzifMBSlwqXNoBrJQJGT6f/knk+WkRONZZvEmN16WsnPh3ZrE8L7uwI= -SHA256 (Pkgfile) = 4f66ef333b5ebf70c5c9ffbc91fdc5ee2e2db1e88d047477e372aab372e91183 -SHA256 (.footprint) = 41de262db71e88d6dfa8f1bd7bdaa2d54e50949a46eaeb8945db1c2eeae67627 -SHA256 (lxml-4.4.2.tgz) = eff69ddbf3ad86375c344339371168640951c302450c5d3e9936e98d6459db06 +RWSagIOpLGJF30kIQ3OCFUybhMg3kI24DgIqHuBwrYuE95PJIJXpLIxIh9/kYShKIDtH/DnTMIHccnyvTSfmoKpciphqsjw2bA4= +SHA256 (Pkgfile) = e6df92fa777e3203364ec75981391eef1dd57818b19860bc412dd10297212cc7 +SHA256 (.footprint) = cf535b41c48288b1c51b1e9809feb12462c622217dae5a608518082efe08b6cb +SHA256 (lxml-4.5.0.tgz) = 8620ce80f50d023d414183bf90cc2576c2837b88e00bea3f33ad2630133bbb60 diff --git a/python-lxml/Pkgfile b/python-lxml/Pkgfile index 46abd3172..3a0ac4d31 100644 --- a/python-lxml/Pkgfile +++ b/python-lxml/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python-beautifulsoup4 python-cssselect python-cython python-html5lib libxslt name=python-lxml -version=4.4.2 +version=4.5.0 release=1 source=(https://lxml.de/files/${name#*-}-$version.tgz)

1 0