diff options
| author | Juergen Daubert <jue@jue.li> | 2018-04-19 15:44:46 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2018-04-19 15:44:46 +0200 |
| commit | b9631780ab532dd1c2654e2a063f6efed801f81c (patch) | |
| tree | db1a6ab7b083985cac2b263e84eb8d7c8367f49a | |
| parent | 3144b62314dd64bb251d9e16f531c56a11fcb771 (diff) | |
| parent | 47cdc9df8cfde7485301d2732dae9094fd01d525 (diff) | |
| download | opt-b9631780ab532dd1c2654e2a063f6efed801f81c.tar.gz opt-b9631780ab532dd1c2654e2a063f6efed801f81c.tar.xz | |
Merge branch '3.3' into 3.4
Conflicts:
mysql/.md5sum
mysql/.signature
mysql/Pkgfile
| -rw-r--r-- | poppler-glib/.md5sum | 2 | ||||
| -rw-r--r-- | poppler-glib/.signature | 6 | ||||
| -rw-r--r-- | poppler-glib/Pkgfile | 2 | ||||
| -rw-r--r-- | poppler-qt5/.footprint | 4 | ||||
| -rw-r--r-- | poppler-qt5/.md5sum | 2 | ||||
| -rw-r--r-- | poppler-qt5/.signature | 8 | ||||
| -rw-r--r-- | poppler-qt5/Pkgfile | 2 | ||||
| -rw-r--r-- | poppler/.footprint | 6 | ||||
| -rw-r--r-- | poppler/.md5sum | 2 | ||||
| -rw-r--r-- | poppler/.signature | 8 | ||||
| -rw-r--r-- | poppler/Pkgfile | 2 |
11 files changed, 22 insertions, 22 deletions
diff --git a/poppler-glib/.md5sum b/poppler-glib/.md5sum index 8f35bcec2..5d7888a6e 100644 --- a/poppler-glib/.md5sum +++ b/poppler-glib/.md5sum @@ -1 +1 @@ -66a54da4896b1408611699feda5c1821 poppler-0.63.0.tar.xz +f7f687ebb60004f8ad61994575018044 poppler-0.64.0.tar.xz diff --git a/poppler-glib/.signature b/poppler-glib/.signature index 542bf59a3..209754aed 100644 --- a/poppler-glib/.signature +++ b/poppler-glib/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ekNgfM5sS0LM+NiKCDWO9y42gxYaMjS33xwpoZ43a471JTilVDq0R7Lyeg5DeJjK9vzoq5Wj8q3n4/PrJcCBQ8= -SHA256 (Pkgfile) = 322395bc1acf4f1d7a92e6ed1c6a371bb0c5038b0aef4eb1d8174477e4b523b3 +RWSE3ohX2g5d/aAt9IULINCElDRhLKudTHbz+q1u5pDTp4cFdUr4/PWEn2hLAiMHeO16msnwqknRL2w/zw/UZWmW5wtoglqs/wM= +SHA256 (Pkgfile) = aefc928adb1c920ebf75a0c1dffd77923385048109a4465ffb275da8c0640f09 SHA256 (.footprint) = 7f982db800a0148c3e12d898e61c070f2d7038bfc561d2184a471a7eca442ee9 -SHA256 (poppler-0.63.0.tar.xz) = 27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111 +SHA256 (poppler-0.64.0.tar.xz) = b21df92ca99f78067785cf2dc8e06deb04726b62389c0ee1f5d8b103c77f64b1 diff --git a/poppler-glib/Pkgfile b/poppler-glib/Pkgfile index 248826e72..7307bca88 100644 --- a/poppler-glib/Pkgfile +++ b/poppler-glib/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gobject-introspection poppler name=poppler-glib -version=0.63.0 +version=0.64.0 release=1 source=(https://poppler.freedesktop.org/poppler-$version.tar.xz) diff --git a/poppler-qt5/.footprint b/poppler-qt5/.footprint index 0242a05c1..321089a2d 100644 --- a/poppler-qt5/.footprint +++ b/poppler-qt5/.footprint @@ -12,7 +12,7 @@ drwxr-xr-x root/root usr/include/poppler/qt5/ -rw-r--r-- root/root usr/include/poppler/qt5/poppler-qt5.h drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libpoppler-qt5.so -> libpoppler-qt5.so.1 -lrwxrwxrwx root/root usr/lib/libpoppler-qt5.so.1 -> libpoppler-qt5.so.1.13.0 --rwxr-xr-x root/root usr/lib/libpoppler-qt5.so.1.13.0 +lrwxrwxrwx root/root usr/lib/libpoppler-qt5.so.1 -> libpoppler-qt5.so.1.14.0 +-rwxr-xr-x root/root usr/lib/libpoppler-qt5.so.1.14.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/poppler-qt5.pc diff --git a/poppler-qt5/.md5sum b/poppler-qt5/.md5sum index 8f35bcec2..5d7888a6e 100644 --- a/poppler-qt5/.md5sum +++ b/poppler-qt5/.md5sum @@ -1 +1 @@ -66a54da4896b1408611699feda5c1821 poppler-0.63.0.tar.xz +f7f687ebb60004f8ad61994575018044 poppler-0.64.0.tar.xz diff --git a/poppler-qt5/.signature b/poppler-qt5/.signature index 379d7875d..c7871e6ae 100644 --- a/poppler-qt5/.signature +++ b/poppler-qt5/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Q99BnWLDPTlWfbXHkJAtG/+Il5VQgbNDn+F6wPNuMGe/PDXnxiLzYHtkUY5UGPhG8SP0atiQk+Tc3dfZjYQigI= -SHA256 (Pkgfile) = fb341e6fb6ee311c8a238b68a2248c427c520fd7109d1a566f4858a319ce3a8b -SHA256 (.footprint) = ed5bed0e9690af2023942ded80bbe32134502589b560fbecb021df85a4d624fd -SHA256 (poppler-0.63.0.tar.xz) = 27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111 +RWSE3ohX2g5d/YIY7fcSn9M8mKTbnlATc4B3ka61cy1GDZE3zzjz1DrZo2vWj+nQgIcV+NjawxWexmcsak81Msq6GiCa3jwywAA= +SHA256 (Pkgfile) = 7c035f0d4d2883ab48d1dabddac65e4e2036883bf28816dd710c7b928c392c02 +SHA256 (.footprint) = dadc532575063709a0f677bb9c9836368020a184679d9ea10a2f440622b4220d +SHA256 (poppler-0.64.0.tar.xz) = b21df92ca99f78067785cf2dc8e06deb04726b62389c0ee1f5d8b103c77f64b1 diff --git a/poppler-qt5/Pkgfile b/poppler-qt5/Pkgfile index 955ae40f2..815803ef7 100644 --- a/poppler-qt5/Pkgfile +++ b/poppler-qt5/Pkgfile @@ -4,7 +4,7 @@ # Depends on: qt5 poppler name=poppler-qt5 -version=0.63.0 +version=0.64.0 release=1 source=(https://poppler.freedesktop.org/poppler-$version.tar.xz) diff --git a/poppler/.footprint b/poppler/.footprint index 6b553f0e3..0a09e605d 100644 --- a/poppler/.footprint +++ b/poppler/.footprint @@ -152,9 +152,9 @@ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libpoppler-cpp.so -> libpoppler-cpp.so.0 lrwxrwxrwx root/root usr/lib/libpoppler-cpp.so.0 -> libpoppler-cpp.so.0.4.0 -rwxr-xr-x root/root usr/lib/libpoppler-cpp.so.0.4.0 -lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.74 -lrwxrwxrwx root/root usr/lib/libpoppler.so.74 -> libpoppler.so.74.0.0 --rwxr-xr-x root/root usr/lib/libpoppler.so.74.0.0 +lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.75 +lrwxrwxrwx root/root usr/lib/libpoppler.so.75 -> libpoppler.so.75.0.0 +-rwxr-xr-x root/root usr/lib/libpoppler.so.75.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/poppler-cairo.pc -rw-r--r-- root/root usr/lib/pkgconfig/poppler-cpp.pc diff --git a/poppler/.md5sum b/poppler/.md5sum index 8f35bcec2..5d7888a6e 100644 --- a/poppler/.md5sum +++ b/poppler/.md5sum @@ -1 +1 @@ -66a54da4896b1408611699feda5c1821 poppler-0.63.0.tar.xz +f7f687ebb60004f8ad61994575018044 poppler-0.64.0.tar.xz diff --git a/poppler/.signature b/poppler/.signature index d9309cac2..5acd99071 100644 --- a/poppler/.signature +++ b/poppler/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dz/5NZi6COFh1kHuX9s7Qurdp59lxcrV2x729iodmvLGIOqXFtJB/IYiWzDbqeD3IVpxXMzxefqRjEl4TvNjAs= -SHA256 (Pkgfile) = 410f44e34d56291a75849b0017d0a0fa7e939524a9759067bcb5ee43ac7ec31f -SHA256 (.footprint) = 0739c74d2dcf82d94e03937bf3827140b81b2f780667ca361e4bae0a0f6b8a3e -SHA256 (poppler-0.63.0.tar.xz) = 27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111 +RWSE3ohX2g5d/cEFSu/7vNwHxt7Q9HurppWL0WXMAYeMyAPYaSJYoV+rHzP8K1rYurz03bkXfO4i8YarTVSANQ+uh2LVJlOLEQ8= +SHA256 (Pkgfile) = 15775c57bab543e5d47d04f1f92739944e77fd9454b34fc896f81406feaaa25e +SHA256 (.footprint) = f8ed992f1d5f5115ed6a1246818bf6a03e5b0ce0e9edc5ccc1c191b2da9a1134 +SHA256 (poppler-0.64.0.tar.xz) = b21df92ca99f78067785cf2dc8e06deb04726b62389c0ee1f5d8b103c77f64b1 diff --git a/poppler/Pkgfile b/poppler/Pkgfile index 974765a44..4258db465 100644 --- a/poppler/Pkgfile +++ b/poppler/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cmake cairo lcms2 name=poppler -version=0.63.0 +version=0.64.0 release=1 source=(https://poppler.freedesktop.org/poppler-$version.tar.xz) |