[haiku-commits] haiku: hrev53122 - build/jam/repositories/HaikuPorts src/add-ons/print/drivers/gutenprint docs/develop/build/repositories src headers/libs/print/libprint
- From: waddlesplash <waddlesplash@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 14 May 2019 19:26:56 -0400 (EDT)
hrev53122 adds 3 changesets to branch 'master'
old head: df0ba1eca130cd0b75fd671476d8e0aad115e46d
new head: 89f1fd6512c10854013d231a85289797e47c7543
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=89f1fd6512c1+%5Edf0ba1eca130
----------------------------------------------------------------------------
e661fdd17ddd: repositories: Move the README into the appropriate docs/develop
directory.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
f95a6bc18a03: HaikuPorts: Synchronize packages; add libpsl and gutenprint8.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
89f1fd6512c1: Bump gutenprint version.
needs gutenprint8 packages to be uploaded.
Change-Id: I1204ff8b1bb85cc0eb615082b205280daabbc290
Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
19 files changed, 212 insertions(+), 211 deletions(-)
build/jam/BuildFeatures | 6 +-
build/jam/repositories/HaikuPorts/x86_64 | 111 +++++------
build/jam/repositories/HaikuPorts/x86_gcc2 | 183 ++++++++++---------
.../develop/build/repositories}/README.md | 8 +-
headers/libs/print/libprint/GraphicsDriver.h | 10 +-
headers/libs/print/libprint/Transport.h | 4 +-
.../print/drivers/gutenprint/GPBinding.cpp | 7 +-
src/add-ons/print/drivers/gutenprint/GPBinding.h | 8 +-
.../print/drivers/gutenprint/GPDriver.cpp | 1 -
src/add-ons/print/drivers/gutenprint/GPDriver.h | 2 +-
src/add-ons/print/drivers/gutenprint/GPJob.cpp | 52 +++---
.../drivers/gutenprint/GPParameterVisitor.cpp | 12 +-
.../print/drivers/gutenprint/OutputStream.h | 2 +-
src/data/package_infos/sparc/haiku | 2 +-
src/data/package_infos/x86/haiku | 2 +-
src/data/package_infos/x86_64/haiku | 2 +-
src/data/package_infos/x86_gcc2/haiku | 2 +-
src/libs/print/libprint/GraphicsDriver.cpp | 5 -
src/libs/print/libprint/Transport.cpp | 4 +-
############################################################################
Commit: e661fdd17ddd0f5d5832fcf9591e8fb2f25f2fd1
URL: https://git.haiku-os.org/haiku/commit/?id=e661fdd17ddd
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue May 14 17:30:43 2019 UTC
repositories: Move the README into the appropriate docs/develop directory.
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPorts/README.md
b/docs/develop/build/repositories/README.md
similarity index 91%
rename from build/jam/repositories/HaikuPorts/README.md
rename to docs/develop/build/repositories/README.md
index 7f6403717a..ae929ca594 100644
--- a/build/jam/repositories/HaikuPorts/README.md
+++ b/docs/develop/build/repositories/README.md
@@ -1,9 +1,9 @@
HaikuPorts repository files
==========================
-This directory contains RemotePackageRepository files
-which detail packages and repositories leveraged during
-Haiku's build process.
+The `build/jam/repositories/HaikuPorts` directory contains
+RemotePackageRepository files which detail packages and
+repositories leveraged during Haiku's build process.
Warning: The URL packages are obtained from
are determined by the sha256sum of the repository
@@ -35,7 +35,7 @@ Improvements are needed. Replace (ARCH) with architecture,
(USER) with your non-
docker exec -it $(docker ps | grep buildmaster_buildmaster_master_(ARCH) |
awk '{ print $1 }') /bin/bash -l
3) apt install vim python3
4) edit the repository define, add the needed packages, _devel packages, and
add base package to source section.
-5) ln -s /var/buildmaster/package_tools/package_repo /usr/bin/package_tools
+5) ln -s /var/buildmaster/package_tools/package_repo /usr/bin/package_repo
6) export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/var/buildmaster/package_tools
7) ./package_tools/hardlink_packages.py (ARCH) ./(ARCH)
/var/packages/repository/master/(ARCH)/current/packages/
/var/packages/build-packages/master/
8) exit; cp
/var/lib/docker/volumes/buildmaster_data_master_(ARCH)/_data/(ARCH)
/home/(USER)/(ARCH); chown (USER) /home/(USER)/(ARCH);
############################################################################
Commit: f95a6bc18a03b4bb59e601cc3e7a9422b9d6f9c7
URL:
https://git.haiku-os.org/haiku/commit/?id=f95a6bc18a03
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue May 14 23:03:02 2019 UTC
HaikuPorts: Synchronize packages; add libpsl and gutenprint8.
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPorts/x86_64
b/build/jam/repositories/HaikuPorts/x86_64
index fa6d09fd50..7ce85f7188 100644
--- a/build/jam/repositories/HaikuPorts/x86_64
+++ b/build/jam/repositories/HaikuPorts/x86_64
@@ -4,7 +4,7 @@ RemotePackageRepository HaikuPorts
:
# architecture "any" packages
be_book-2008_10_26-3
- ca_root_certificates-2018_10_17-1
+ ca_root_certificates-2019_01_23-1
gnu_efi_kernel-3.0.9-1
haikuporter-1.2.2-2
noto-20170920-3
@@ -25,16 +25,16 @@ RemotePackageRepository HaikuPorts
bzip2_devel-1.0.6-8
cdrtools-3.02~a09-1
cdrtools_devel-3.02~a09-1
- coreutils-8.29-1
+ coreutils-8.29-2
ctags-5.8-5
- curl-7.62.0-1
- curl_devel-7.62.0-1
+ curl-7.64.1-1
+ curl_devel-7.64.1-1
cvs-1.12.13.1-8
- diffutils-3.6-2
+ diffutils-3.7-1
expat-2.2.6-1
expat_devel-2.2.6-1
- ffmpeg-4.1-1
- ffmpeg_devel-4.1-1
+ ffmpeg-4.1.3-2
+ ffmpeg_devel-4.1.3-2
findutils-4.6.0-1
flex-2.6.4-1
fluidlite-1.0.0-3
@@ -50,49 +50,49 @@ RemotePackageRepository HaikuPorts
gcc_syslibs_devel-7.3.0_2018_05_01-4
giflib-5.1.4-2
giflib_devel-5.1.4-2
- git-2.19.1-2
- git_arch-2.19.1-2
- git_cvs-2.19.1-2
- git_daemon-2.19.1-2
- git_email-2.19.1-2
- git_svn-2.19.1-2
+ git-2.21.0-2
+ git_arch-2.21.0-2
+ git_cvs-2.21.0-2
+ git_daemon-2.21.0-2
+ git_email-2.21.0-2
+ git_svn-2.21.0-2
glu-9.0.0-7
glu_devel-9.0.0-7
gmp-6.1.2-3
gnutls-3.6.4-1
grep-3.3-1
groff-1.22.3-1
- gutenprint-5.2.14-1
- gutenprint_devel-5.2.14-1
- gzip-1.9-2
- haikuwebkit-1.6.8-2
- haikuwebkit_devel-1.6.8-2
+ gutenprint8-5.3.1-1
+ gutenprint8_devel-5.3.1-1
+ gzip-1.10-1
+ haikuwebkit-1.6.9-1
+ haikuwebkit_devel-1.6.9-1
icu-57.1-3
icu_devel-57.1-3
ilmbase-2.2.1-2
ilmbase_devel-2.2.1-2
jam-2.5_2018_11_21-6
jasper1-1.900.5-2
- jasper-2.0.14-1
- jasper_devel-2.0.14-1
+ jasper-2.0.16-1
+ jasper_devel-2.0.16-1
jpeg-9c-2
jpeg_devel-9c-2
keymapswitcher-1.2.7.11-8
lcms-2.9-2
lcms_devel-2.9-2
- less-542-1
- libbluray-1.0.2-1
- libbluray_devel-1.0.2-1
+ less-550-1
+ libbluray-1.1.1-1
+ libbluray_devel-1.1.1-1
libdvdnav-6.0.0-1
libdvdnav_devel-6.0.0-1
- libdvdread-6.0.0-2
- libdvdread_devel-6.0.0-2
+ libdvdread-6.0.1-1
+ libdvdread_devel-6.0.1-1
libedit-20180525_3.1-1
libedit_devel-20180525_3.1-1
libexecinfo-1.1-5
libffi-3.2.1-4
libgcrypt-1.8.4-1
- libgpg_error-1.32-1
+ libgpg_error-1.36-1
libiconv-1.15-4
libicns-0.8.1-8
libicns_devel-0.8.1-8
@@ -100,12 +100,14 @@ RemotePackageRepository HaikuPorts
libmodplug-0.8.9.0-1
libogg-1.3.3-2
libogg_devel-1.3.3-2
- libpcap-1.8.1-3
- libpcap_devel-1.8.1-3
+ libpcap-1.8.1-4
+ libpcap_devel-1.8.1-4
libpcre-8.42-1
- libpcre2-10.30-2
- libpng16-1.6.35-1
- libpng16_devel-1.6.35-1
+ libpcre2-10.33-1
+ libpng16-1.6.37-1
+ libpng16_devel-1.6.37-1
+ libpsl-0.20.2-1
+ libpsl_devel-0.20.2-1
libsolv-0.3.0_haiku_2014_12_22-3
libsolv_devel-0.3.0_haiku_2014_12_22-3
libtasn1-4.13-1
@@ -117,10 +119,10 @@ RemotePackageRepository HaikuPorts
libvorbis_devel-1.3.6-1
libvpx3-1.5.0-3
libvpx3_devel-1.5.0-3
- libwebp-1.0.0-1
- libwebp_devel-1.0.0-1
- libxml2-2.9.7-2
- libxml2_devel-2.9.7-2
+ libwebp-1.0.2-1
+ libwebp_devel-1.0.2-1
+ libxml2-2.9.9-3
+ libxml2_devel-2.9.9-3
libxslt-1.1.32-1
live555-2016.06.22-5
live555_devel-2016.06.22-5
@@ -136,19 +138,19 @@ RemotePackageRepository HaikuPorts
mkdepend-1.7-5
mpc-1.1.0-1
mpfr-3.1.6-3
- nano-3.2-1
+ nano-4.2-1
nasm-2.12.02-1
ncurses6-6.1-1
ncurses6_devel-6.1-1
netcat-1.10-4
- nettle-3.4-1
+ nettle-3.4.1-1
nghttp2-1.34.0-1
nghttp2_devel-1.34.0-1
openexr-2.2.1-2
openexr_devel-2.2.1-2
- openjpeg-2.3.0-1
- openjpeg_devel-2.3.0-1
- openssh-7.6p1-1
+ openjpeg-2.3.1-2
+ openjpeg_devel-2.3.1-2
+ openssh-7.9p1-1
openssl-1.0.2q-1
openssl_devel-1.0.2q-1
p7zip-9.20.1-7
@@ -156,29 +158,29 @@ RemotePackageRepository HaikuPorts
pdflib-5.0.3-3
pdfwriter-1.0-3
pe-2.4.5-8
- perl-5.26.2-2
+ perl-5.28.2-1
pkgconfig-0.29.2-3
- python-2.7.15-1
+ python-2.7.16-1
qrencode_kdl_devel-3.4.4-2
- readline-7.0.3-2
+ readline-7.0.3-3
scons-2.5.1-3
sed-4.4-3
sharutils-4.15.2-3
- speex-1.2.0-3
- speex_devel-1.2.0-3
- sqlite-3.26.0.0-1
+ speex-1.2.0-4
+ speex_devel-1.2.0-4
+ sqlite-3.28.0.0-1
subversion-1.9.7-2
subversion_devel-1.9.7-2
taglib-1.11.1-4
taglib_devel-1.11.1-4
- tar-1.30-1
+ tar-1.32-1
tcpdump-4.9.2-1
- texinfo-6.5-1
+ texinfo-6.5-2
tiff4-4.0.10-1
tiff4_devel-4.0.10-1
- unzip-6.0-5
+ unzip-6.10c23-4
vision-0.10.3-2
- wget-1.19.5-1
+ wget-1.20.1-1
which-2.21-5
wpa_supplicant-2.7~devel.haiku.1-1
xz_utils-5.2.4-2
@@ -186,9 +188,9 @@ RemotePackageRepository HaikuPorts
zip-3.0-4
zlib-1.2.11-3
zlib_devel-1.2.11-3
- zstd-1.3.7-1
- zstd_bin-1.3.7-1
- zstd_devel-1.3.7-1
+ zstd-1.3.8-1
+ zstd_bin-1.3.8-1
+ zstd_devel-1.3.8-1
:
# source packages
autoconf
@@ -220,7 +222,7 @@ RemotePackageRepository HaikuPorts
gmp
gnutls
grep
- gutenprint
+ gutenprint8
gzip
haikuporter
icu
@@ -247,6 +249,7 @@ RemotePackageRepository HaikuPorts
libpcre
libpcre2
libpng16
+ libpsl
libsolv
libtasn1
libtheora
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2
b/build/jam/repositories/HaikuPorts/x86_gcc2
index 5c519d08b9..f9ea41e3bf 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -3,9 +3,9 @@ RemotePackageRepository HaikuPorts
:
https://eu.hpkg.haiku-os.org/haikuports/master/build-packages
:
# architecture "any" packages
- be_book-2008_10_26-2
- ca_root_certificates-2018_06_20-1
- gnu_efi_kernel-3.0.8-1
+ be_book-2008_10_26-3
+ ca_root_certificates-2019_01_23-1
+ gnu_efi_kernel-3.0.9-1
haikuporter-1.2.2-2
noto-20170920-3
noto_sans_cjk_jp-1.004-2
@@ -26,22 +26,22 @@ RemotePackageRepository HaikuPorts
cdrtools-3.02~a09-1
cdrtools_devel-3.02~a09-1
ctags-5.8-5
- coreutils-8.24-1
- curl-7.61.1-2
- curl_devel-7.61.1-2
+ coreutils-8.24-2
+ curl-7.64.1-1
+ curl_devel-7.64.1-1
cvs-1.12.13.1-8
- diffutils-3.5-2
+ diffutils-3.7-1
expat-2.2.6-1
expat_devel-2.2.6-1
findutils-4.6.0-1
- ffmpeg-4.0.2-1
- ffmpeg_devel-4.0.2-1
+ ffmpeg-4.1.1-1
+ ffmpeg_devel-4.1.1-1
flex-2.6.4-1
fluidlite_devel-1.0.0-3
fontconfig-2.12.6-2
fontconfig_devel-2.12.6-2
- freetype-2.9-1
- freetype_devel-2.9-1
+ freetype-2.9.1-1
+ freetype_devel-2.9.1-1
gawk-4.1.4-2
gettext_libintl-0.19.8.1-5
gcc-2.95.3_2017_07_20-2
@@ -49,47 +49,49 @@ RemotePackageRepository HaikuPorts
giflib6-5.0.5-5
giflib-5.1.4-2
giflib_devel-5.1.4-2
- git-2.19.0-1
- git_arch-2.19.0-1
- git_cvs-2.19.0-1
- git_daemon-2.19.0-1
- git_email-2.19.0-1
- git_svn-2.19.0-1
+ git-2.21.0-2
+ git_arch-2.21.0-2
+ git_cvs-2.21.0-2
+ git_daemon-2.21.0-2
+ git_email-2.21.0-2
+ git_svn-2.21.0-2
glu-9.0.0-7
glu_devel-9.0.0-7
grep-2.24-1
groff-1.20.1-4
- gutenprint-5.2.14-1
- gutenprint_devel-5.2.14-1
- gzip-1.8-2
+ gutenprint8-5.3.1-1
+ gutenprint8_devel-5.3.1-1
+ gzip-1.10-1
icu-57.1-3
icu_devel-57.1-3
ilmbase-2.2.1-2
ilmbase_devel-2.2.1-2
- jam-2.5_2012_10_12-5
+ jam-2.5_2018_11_21-6
jasper1-1.900.5-2
- jasper-2.0.14-1
- jasper_devel-2.0.14-1
+ jasper-2.0.16-1
+ jasper_devel-2.0.16-1
jpeg-9c-2
jpeg_devel-9c-2
- keymapswitcher-1.2.7.11-4
- less-538-1
+ keymapswitcher-1.2.7.11-8
+ less-550-1
libedit-20180525_3.1-1
libedit_devel-20180525_3.1-1
libffi-3.0.13-2
libiconv-1.15-4
libicns-0.8.1-8
libicns_devel-0.8.1-8
- liblayout-1.4.1-4
+ liblayout-1.4.1-6
libmodplug-0.8.9.0-1
libogg-1.3.3-2
libogg_devel-1.3.3-2
libpcap-1.8.1-3
libpcap_devel-1.8.1-3
libpcre-8.42-1
- libpcre2-10.30-2
- libpng16-1.6.35-1
- libpng16_devel-1.6.35-1
+ libpcre2-10.33-1
+ libpng16-1.6.37-1
+ libpng16_devel-1.6.37-1
+ libpsl-0.20.2-1
+ libpsl_devel-0.20.2-1
libsolv-0.3.0_haiku_2014_12_22-3
libsolv_devel-0.3.0_haiku_2014_12_22-3
libtheora-1.1.1-7
@@ -98,16 +100,16 @@ RemotePackageRepository HaikuPorts
libvorbis-1.3.6-1
libvorbis_devel-1.3.6-1
libvpx-1.0.0-2
- libwebp-1.0.0-1
- libwebp_devel-1.0.0-1
- libxml2-2.9.3-5
- libxml2_devel-2.9.3-5
+ libwebp-1.0.2-1
+ libwebp_devel-1.0.2-1
+ libxml2-2.9.9-3
+ libxml2_devel-2.9.9-3
live555-2016.06.22-5
live555_devel-2016.06.22-5
m4-1.4.18-3
make-4.1-3
man-1.6g-6
- mercurial-3.2.1-5
+ mercurial-4.8.1-2
mesa-7.9.2-11
mesa_devel-7.9.2-11
mesa_swrast-7.9.2-11
@@ -117,44 +119,44 @@ RemotePackageRepository HaikuPorts
ncurses6-6.1-1
ncurses6_devel-6.1-1
netcat-1.10-4
- nghttp2-1.33.0-1
- nghttp2_devel-1.33.0-1
+ nghttp2-1.34.0-1
+ nghttp2_devel-1.34.0-1
openexr-2.2.1-2
openexr_devel-2.2.1-2
openjpeg-2.1.2-3
openjpeg_devel-2.1.2-3
- openssh-7.2p2-2
- openssl-1.0.2p-1
- openssl_devel-1.0.2p-1
+ openssh-7.9p1-1
+ openssl-1.0.2q-1
+ openssl_devel-1.0.2q-1
p7zip-9.20.1-7
- patch-2.7.5-2
+ patch-2.7.5-3
pdflib-5.0.3-3
pdfwriter-1.0-3
pe-2.4.5-8
- perl-5.26.1-2
+ perl-5.28.2-1
pkgconfig-0.29.2-3
- python-2.7.12-2
+ python-2.7.16-1
qrencode_kdl_devel-3.4.4-2
readline6-6.3.8-2
- readline-7.0.3-2
+ readline-7.0.3-3
scons-2.5.1-3
sed-4.2.1-6
sharutils-4.15.2-3
- speex-1.2.0-3
- speex_devel-1.2.0-3
- sqlite-3.25.2.0-1
+ speex-1.2.0-4
+ speex_devel-1.2.0-4
+ sqlite-3.28.0.0-1
subversion-1.9.7-1
subversion_devel-1.9.7-1
taglib-1.7.2-3
taglib_devel-1.7.2-3
- tar-1.30-1
+ tar-1.32-1
tcpdump-4.9.2-1
texinfo-6.1-3
- tiff4-4.0.9-2
- tiff4_devel-4.0.9-2
- unzip-6.10c23-2
+ tiff4-4.0.10-1
+ tiff4_devel-4.0.10-1
+ unzip-6.10c23-4
vision-0.10.3-2
- wget-1.19.4-1
+ wget-1.20.1-1
which-2.21-5
wonderbrush-2.1.2-5
wpa_supplicant-2.7~devel.haiku.1-1
@@ -168,20 +170,20 @@ RemotePackageRepository HaikuPorts
bzip2_x86_devel-1.0.6-8
cdrtools_x86-3.02~a09-1
cdrtools_x86_devel-3.02~a09-1
- curl_x86-7.61.1-2
- curl_x86_devel-7.61.1-2
+ curl_x86-7.64.1-1
+ curl_x86_devel-7.64.1-1
expat_x86-2.2.6-1
expat_x86_devel-2.2.6-1
- ffmpeg_x86-4.0.2-1
- ffmpeg_x86_devel-4.0.2-1
+ ffmpeg_x86-4.1.3-2
+ ffmpeg_x86_devel-4.1.3-2
fluidlite_x86_devel-1.0.0-3
fontconfig_x86-2.12.6-2
fontconfig_x86_devel-2.12.6-2
- freetype_x86-2.9-1
- freetype_x86_devel-2.9-1
- gcc_x86-7.3.0_2018_05_01-3
- gcc_x86_syslibs-7.3.0_2018_05_01-3
- gcc_x86_syslibs_devel-7.3.0_2018_05_01-3
+ freetype_x86-2.9.1-1
+ freetype_x86_devel-2.9.1-1
+ gcc_x86-7.3.0_2018_05_01-4
+ gcc_x86_syslibs-7.3.0_2018_05_01-4
+ gcc_x86_syslibs_devel-7.3.0_2018_05_01-4
gettext_x86_libintl-0.19.8.1-5
giflib6_x86-5.0.5-5
giflib_x86-5.1.4-2
@@ -189,16 +191,16 @@ RemotePackageRepository HaikuPorts
glu_x86-9.0.0-7
glu_x86_devel-9.0.0-7
gmp_x86-6.1.2-3
- gnutls_x86-3.6.3-1
- haikuwebkit_x86-1.6.7-3
- haikuwebkit_x86_devel-1.6.7-3
+ gnutls_x86-3.6.4-1
+ haikuwebkit_x86-1.6.9-1
+ haikuwebkit_x86_devel-1.6.9-1
icu_x86-57.1-3
icu_x86_devel-57.1-3
ilmbase_x86-2.2.1-2
ilmbase_x86_devel-2.2.1-2
jasper1_x86-1.900.5-2
- jasper_x86-2.0.14-1
- jasper_x86_devel-2.0.14-1
+ jasper_x86-2.0.16-1
+ jasper_x86_devel-2.0.16-1
jpeg_x86-9c-2
jpeg_x86_devel-9c-2
lcms_x86-2.9-2
@@ -206,17 +208,17 @@ RemotePackageRepository HaikuPorts
libedit_x86-20180525_3.1-1
libedit_x86_devel-20180525_3.1-1
libexecinfo_x86-1.1-5
- libgcrypt_x86-1.8.3-1
- libgpg_error_x86-1.32-1
+ libgcrypt_x86-1.8.4-1
+ libgpg_error_x86-1.36-1
libiconv_x86-1.13.1-9
libicns_x86-0.8.1-8
libicns_x86_devel-0.8.1-8
- libidn2_x86-2.0.4-1
+ libidn2_x86-2.0.5-1
libmodplug_x86-0.8.9.0-1
libogg_x86-1.3.3-2
libogg_x86_devel-1.3.3-2
- libpng16_x86-1.6.35-1
- libpng16_x86_devel-1.6.35-1
+ libpng16_x86-1.6.37-1
+ libpng16_x86_devel-1.6.37-1
libsolv_x86-0.3.0_haiku_2014_12_22-3
libsolv_x86_devel-0.3.0_haiku_2014_12_22-3
libtasn1_x86-4.13-1
@@ -230,10 +232,10 @@ RemotePackageRepository HaikuPorts
libvpx3_x86-1.5.0-3
libvpx3_x86_devel-1.5.0-3
libwebp5_x86-0.4.4-2
- libwebp_x86-1.0.0-1
- libwebp_x86_devel-1.0.0-1
- libxml2_x86-2.9.3-5
- libxml2_x86_devel-2.9.3-5
+ libwebp_x86-1.0.2-1
+ libwebp_x86_devel-1.0.2-1
+ libxml2_x86-2.9.9-3
+ libxml2_x86_devel-2.9.9-3
libxslt_x86-1.1.32-1
live555_x86-2016.06.22-5
live555_x86_devel-2016.06.22-5
@@ -241,31 +243,31 @@ RemotePackageRepository HaikuPorts
llvm_x86_clang-5.0.0-3
llvm_x86_clang_analysis-5.0.0-3
llvm_x86_libs-5.0.0-3
- mesa_x86-17.1.10-3
- mesa_x86_devel-17.1.10-3
- mesa_x86_swpipe-17.1.10-3
+ mesa_x86-17.1.10-4
+ mesa_x86_devel-17.1.10-4
+ mesa_x86_swpipe-17.1.10-4
ncurses6_x86-6.1-1
ncurses6_x86_devel-6.1-1
mpc_x86-1.1.0-1
mpfr_x86-3.1.6-3
- nettle_x86-3.4-1
- nghttp2_x86-1.33.0-1
- nghttp2_x86_devel-1.33.0-1
+ nettle_x86-3.4.1-1
+ nghttp2_x86-1.34.0-1
+ nghttp2_x86_devel-1.34.0-1
openexr_x86-2.2.1-2
openexr_x86_devel-2.2.1-2
- openjpeg_x86-2.2.0-1
- openjpeg_x86_devel-2.2.0-1
- openssl_x86-1.0.2p-1
- openssl_x86_devel-1.0.2p-1
+ openjpeg_x86-2.3.1-2
+ openjpeg_x86_devel-2.3.1-2
+ openssl_x86-1.0.2q-1
+ openssl_x86_devel-1.0.2q-1
pkgconfig_x86-0.29.2-3
sharutils_x86-4.15.2-3
- speex_x86-1.2.0-3
- speex_x86_devel-1.2.0-3
- sqlite_x86-3.25.2.0-1
+ speex_x86-1.2.0-4
+ speex_x86_devel-1.2.0-4
+ sqlite_x86-3.28.0.0-1
taglib_x86-1.11.1-4
taglib_x86_devel-1.11.1-4
- tiff4_x86-4.0.9-2
- tiff4_x86_devel-4.0.9-2
+ tiff4_x86-4.0.10-1
+ tiff4_x86_devel-4.0.10-1
xz_utils_x86-5.2.4-2
xz_utils_x86_devel-5.2.4-2
zlib_x86-1.2.11-3
@@ -308,7 +310,7 @@ RemotePackageRepository HaikuPorts
gnutls
gnutls_x86
grep
- gutenprint
+ gutenprint8
gzip
haikuporter
haikuwebkit_x86
@@ -337,6 +339,7 @@ RemotePackageRepository HaikuPorts
libpcre2
libpng16
libpng16_x86
+ libpsl
libsolv
libtasn1
libtheora
############################################################################
Revision: hrev53122
Commit: 89f1fd6512c10854013d231a85289797e47c7543
URL:
https://git.haiku-os.org/haiku/commit/?id=89f1fd6512c1
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sun Apr 14 18:06:10 2019 UTC
Committer: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Commit-Date: Tue May 14 23:11:41 2019 UTC
Bump gutenprint version.
needs gutenprint8 packages to be uploaded.
Change-Id: I1204ff8b1bb85cc0eb615082b205280daabbc290
Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 6f7b668501..47bd6ece84 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -304,11 +304,11 @@ if [ IsPackageAvailable fontconfig_devel ] {
}
# Gutenprint
-if [ IsPackageAvailable gutenprint_devel ] {
+if [ IsPackageAvailable gutenprint8_devel ] {
ExtractBuildFeatureArchives gutenprint :
- file: base gutenprint
+ file: base gutenprint8
runtime: lib
- file: devel gutenprint_devel
+ file: devel gutenprint8_devel
depends: base
library: $(developLibDir)/libgutenprint.so
headers: $(developHeadersDir)
$(developHeadersDir)/gutenprint
diff --git a/headers/libs/print/libprint/GraphicsDriver.h
b/headers/libs/print/libprint/GraphicsDriver.h
index 694a150452..e6261fc025 100644
--- a/headers/libs/print/libprint/GraphicsDriver.h
+++ b/headers/libs/print/libprint/GraphicsDriver.h
@@ -48,16 +48,16 @@ protected:
virtual bool EndDocument(bool success);
void WriteSpoolData(const void* buffer, size_t size)
- throw (TransportException);
+ /* throw (TransportException)
*/;
void WriteSpoolString(const char* buffer, ...)
- throw (TransportException);
+ /* throw (TransportException)
*/;
void WriteSpoolChar(char c)
- throw (TransportException);
+ /* throw (TransportException)
*/;
void ReadSpoolData(void* buffer, size_t size)
- throw (TransportException);
+ /* throw (TransportException)
*/;
int ReadSpoolChar()
- throw (TransportException);
+ /* throw (TransportException)
*/;
static void ConvertToRGB24(const void* src, void* dst, int width,
color_space cs);
diff --git a/headers/libs/print/libprint/Transport.h
b/headers/libs/print/libprint/Transport.h
index b2f74cc87b..33f7fdfdc2 100644
--- a/headers/libs/print/libprint/Transport.h
+++ b/headers/libs/print/libprint/Transport.h
@@ -38,9 +38,9 @@ public:
~Transport();
void Write(const void *buffer, size_t size)
- throw (TransportException);
+ /* throw (TransportException)
*/;
void Read(void *buffer, size_t size)
- throw (TransportException);
+ /* throw (TransportException)
*/;
bool CheckAbort() const;
bool IsPrintToFileCanceled() const;
const string& LastError() const;
diff --git a/src/add-ons/print/drivers/gutenprint/GPBinding.cpp
b/src/add-ons/print/drivers/gutenprint/GPBinding.cpp
index a6157ba0c1..e8b54ac926 100644
--- a/src/add-ons/print/drivers/gutenprint/GPBinding.cpp
+++ b/src/add-ons/print/drivers/gutenprint/GPBinding.cpp
@@ -156,7 +156,6 @@ GPBinding::GetCapabilities(const char* driver,
GPCapabilities* capabilities)
status_t
GPBinding::BeginJob(GPJobConfiguration* configuration,
OutputStream* outputStream)
- throw(TransportException)
{
fOutputStream = outputStream;
fJob.SetApplicationName("Gutenprint");
@@ -168,7 +167,7 @@ GPBinding::BeginJob(GPJobConfiguration* configuration,
void
-GPBinding::EndJob() throw(TransportException)
+GPBinding::EndJob()
{
fJob.End();
fOutputStream = NULL;
@@ -176,13 +175,13 @@ GPBinding::EndJob() throw(TransportException)
void
-GPBinding::BeginPage() throw(TransportException)
+GPBinding::BeginPage()
{
}
void
-GPBinding::EndPage() throw(TransportException)
+GPBinding::EndPage()
{
status_t status = fJob.PrintPage(fBands);
DeleteBands();
diff --git a/src/add-ons/print/drivers/gutenprint/GPBinding.h
b/src/add-ons/print/drivers/gutenprint/GPBinding.h
index b8ba8123ec..f690668f90 100644
--- a/src/add-ons/print/drivers/gutenprint/GPBinding.h
+++ b/src/add-ons/print/drivers/gutenprint/GPBinding.h
@@ -44,10 +44,10 @@ public:
GPCapabilities* capabilities);
status_t BeginJob(GPJobConfiguration* configuration,
- OutputStream* outputStream) throw(TransportException);
- void EndJob() throw(TransportException);
- void BeginPage() throw(TransportException);
- void EndPage() throw(TransportException);
+ OutputStream* outputStream) /* throw(TransportException) */;
+ void EndJob() /* throw(TransportException) */;
+ void BeginPage() /* throw(TransportException) */;
+ void EndPage() /* throw(TransportException) */;
status_t AddBitmapToPage(BBitmap* bitmap, BRect validRect,
BPoint where);
private:
diff --git a/src/add-ons/print/drivers/gutenprint/GPDriver.cpp
b/src/add-ons/print/drivers/gutenprint/GPDriver.cpp
index ce1f041719..93dc499dbc 100644
--- a/src/add-ons/print/drivers/gutenprint/GPDriver.cpp
+++ b/src/add-ons/print/drivers/gutenprint/GPDriver.cpp
@@ -37,7 +37,6 @@ GPDriver::GPDriver(BMessage* message, PrinterData*
printerData,
void
GPDriver::Write(const void* buffer, size_t size)
- throw (TransportException)
{
WriteSpoolData(buffer, size);
}
diff --git a/src/add-ons/print/drivers/gutenprint/GPDriver.h
b/src/add-ons/print/drivers/gutenprint/GPDriver.h
index 602ea83e31..2aa8f70b66 100644
--- a/src/add-ons/print/drivers/gutenprint/GPDriver.h
+++ b/src/add-ons/print/drivers/gutenprint/GPDriver.h
@@ -21,7 +21,7 @@ public:
const PrinterCap* printer_cap);
void Write(const void *buffer, size_t size)
- throw(TransportException);
+ /* throw(TransportException) */;
protected:
bool StartDocument();
diff --git a/src/add-ons/print/drivers/gutenprint/GPJob.cpp
b/src/add-ons/print/drivers/gutenprint/GPJob.cpp
index c9d61ab3a6..d0519ad5bb 100644
--- a/src/add-ons/print/drivers/gutenprint/GPJob.cpp
+++ b/src/add-ons/print/drivers/gutenprint/GPJob.cpp
@@ -30,32 +30,34 @@ public:
}
- void ToGutenprint(int32 fromX, int32 fromY, int32& toX, int32& toY) {
+ void ToGutenprint(int32 fromX, int32 fromY, double& toX, double& toY) {
toX = fromX * kGutenprintUnit / fXDPI;
toY = fromY * kGutenprintUnit / fYDPI;
}
- void ToGutenprintCeiling(int32 fromX, int32 fromY, int32& toX, int32&
toY) {
+ void ToGutenprintCeiling(int32 fromX, int32 fromY, double& toX,
+ double& toY) {
toX = (fromX * kGutenprintUnit + fXDPI - 1) / fXDPI;
toY = (fromY * kGutenprintUnit + fYDPI - 1) / fYDPI;
}
- void FromGutenprint(int32 fromX, int32 fromY, int32& toX, int32& toY) {
- toX = fromX * fXDPI / kGutenprintUnit;
- toY = fromY * fYDPI / kGutenprintUnit;
+ void FromGutenprint(double fromX, double fromY, int32& toX, int32& toY)
{
+ toX = (int32)(fromX * fXDPI / kGutenprintUnit);
+ toY = (int32)(fromY * fYDPI / kGutenprintUnit);
}
- void FromGutenprintCeiling(int32 fromX, int32 fromY, int32& toX, int32&
toY) {
- toX = (fromX * fXDPI + kGutenprintUnit - 1) / kGutenprintUnit;
- toY = (fromY * fYDPI + kGutenprintUnit - 1) / kGutenprintUnit;
+ void FromGutenprintCeiling(double fromX, double fromY, int32& toX,
+ int32& toY) {
+ toX = (int32)((fromX * fXDPI + kGutenprintUnit - 1) /
kGutenprintUnit);
+ toY = (int32)((fromY * fYDPI + kGutenprintUnit - 1) /
kGutenprintUnit);
}
- void SizeFromGutenprint(int32 fromWidth, int32 fromHeight,
+ void SizeFromGutenprint(double fromWidth, double fromHeight,
int32& toWidth, int32& toHeight) {
- toWidth = fromWidth * fXDPI / kGutenprintUnit;
- toHeight = fromHeight * fYDPI / kGutenprintUnit;
+ toWidth = (int32)(fromWidth * fXDPI / kGutenprintUnit);
+ toHeight = (int32)(fromHeight * fYDPI / kGutenprintUnit);
}
void RoundUpToWholeInches(int32& width, int32& height) {
@@ -66,8 +68,8 @@ public:
}
private:
- int32 fXDPI;
- int32 fYDPI;
+ double fXDPI;
+ double fYDPI;
};
@@ -239,18 +241,18 @@ GPJob::PrintPage(list<GPBand*>& bands) {
fBands = &bands;
fCachedBand = NULL;
- Rectangle<int> imageableArea;
+ Rectangle<stp_dimension_t> imageableArea;
stp_get_imageable_area(fVariables, &imageableArea.left,
&imageableArea.right, &imageableArea.bottom,
&imageableArea.top);
- fprintf(stderr, "GPJob imageable area left %d, top %d, right %d, "
- "bottom %d\n",
+ fprintf(stderr, "GPJob imageable area left %f, top %f, right %f, "
+ "bottom %f\n",
imageableArea.left, imageableArea.top, imageableArea.right,
imageableArea.bottom);
- fprintf(stderr, "GPJob width %d %s, height %d %s\n",
+ fprintf(stderr, "GPJob width %f %s, height %f %s\n",
imageableArea.Width(),
- imageableArea.Width() % 72 == 0 ? "whole inches" : "not whole
inches",
+ std::fmod(imageableArea.Width(), 72.) == 0.0 ? "whole inches" :
"not whole inches",
imageableArea.Height(),
- imageableArea.Height() % 72 == 0 ? "whole inches" : "not whole
inches"
+ std::fmod(imageableArea.Height(), 72.) == 0.0 ? "whole inches"
: "not whole inches"
);
CoordinateSystem coordinateSystem;
@@ -286,16 +288,16 @@ GPJob::PrintPage(list<GPBand*>& bands) {
// calculate the position and size of the image to be printed on the
page
// unit: 1/72 Inches
// constraints: the image must be inside the imageable area
- int32 left;
- int32 top;
+ double left;
+ double top;
coordinateSystem.ToGutenprint(fPrintRect.left, fPrintRect.top, left,
top);
if (left < imageableArea.left)
left = imageableArea.left;
if (top < imageableArea.top)
top = imageableArea.top;
- int32 right;
- int32 bottom;
+ double right;
+ double bottom;
coordinateSystem.ToGutenprintCeiling(fPrintRect.right,
fPrintRect.bottom,
right, bottom);
if (right > imageableArea.right)
@@ -303,8 +305,8 @@ GPJob::PrintPage(list<GPBand*>& bands) {
if (bottom > imageableArea.bottom)
bottom = imageableArea.bottom;
- int32 width = right - left;
- int32 height = bottom - top;
+ double width = right - left;
+ double height = bottom - top;
// because of rounding and clipping in the previous step,
// now the image frame has to be synchronized
diff --git a/src/add-ons/print/drivers/gutenprint/GPParameterVisitor.cpp
b/src/add-ons/print/drivers/gutenprint/GPParameterVisitor.cpp
index 78ee7167a1..9e02ee06fa 100644
--- a/src/add-ons/print/drivers/gutenprint/GPParameterVisitor.cpp
+++ b/src/add-ons/print/drivers/gutenprint/GPParameterVisitor.cpp
@@ -203,12 +203,12 @@ GPParameterVisitor::VisitStringList(stp_parameter_t*
parameter)
} else if (strcmp(name, kPageSize) == 0) {
stp_set_string_parameter(fVariables, kPageSize, key);
- int width;
- int height;
+ stp_dimension_t width;
+ stp_dimension_t height;
stp_get_media_size(fVariables, &width, &height);
BSize pageSize(width, height);
- int left, right, top, bottom;
+ stp_dimension_t left, right, top, bottom;
stp_get_imageable_area(fVariables, &left, &right,
&bottom, &top);
BRect imageableArea(left, top, right, bottom);
@@ -266,9 +266,9 @@
GPParameterVisitor::VisitDimensionParameter(stp_parameter_t* description,
{
const char* name = description->name;
const char* text = description->text;
- int lower = description->bounds.dimension.lower;
- int upper = description->bounds.dimension.upper;
- int defaultValue = description->deflt.dimension;
+ double lower = description->bounds.dimension.lower;
+ double upper = description->bounds.dimension.upper;
+ double defaultValue = description->deflt.dimension;
if (lower <= defaultValue && defaultValue <= upper)
DimensionParameter(name, text, lower, upper, defaultValue,
parameterClass);
diff --git a/src/add-ons/print/drivers/gutenprint/OutputStream.h
b/src/add-ons/print/drivers/gutenprint/OutputStream.h
index f46b81d379..bab48beebf 100644
--- a/src/add-ons/print/drivers/gutenprint/OutputStream.h
+++ b/src/add-ons/print/drivers/gutenprint/OutputStream.h
@@ -15,7 +15,7 @@ class OutputStream
{
public:
virtual void Write(const void *buffer, size_t size)
- throw(TransportException) = 0;
+ /* throw(TransportException) */
= 0;
};
diff --git a/src/data/package_infos/sparc/haiku
b/src/data/package_infos/sparc/haiku
index 49a53a8055..da240386c9 100644
--- a/src/data/package_infos/sparc/haiku
+++ b/src/data/package_infos/sparc/haiku
@@ -77,7 +77,7 @@ requires {
lib:libexpat
#endif
#ifdef HAIKU_BUILD_FEATURE_SPARC_GUTENPRINT_ENABLED
- lib:libgutenprint
+ lib:libgutenprint >= 8
#endif
#ifdef HAIKU_BUILD_FEATURE_SPARC_LIBICNS_ENABLED
lib:libicns
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index d2eba7d17d..9f4185e524 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -78,7 +78,7 @@ requires {
lib:libexpat
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_GUTENPRINT_ENABLED
- lib:libgutenprint
+ lib:libgutenprint >= 8
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_LIBICNS_ENABLED
lib:libicns
diff --git a/src/data/package_infos/x86_64/haiku
b/src/data/package_infos/x86_64/haiku
index 5c3a9a7b60..ca960a82e5 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -77,7 +77,7 @@ requires {
lib:libexpat
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_64_GUTENPRINT_ENABLED
- lib:libgutenprint
+ lib:libgutenprint >= 8
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBICNS_ENABLED
lib:libicns
diff --git a/src/data/package_infos/x86_gcc2/haiku
b/src/data/package_infos/x86_gcc2/haiku
index 5da6a2cd53..f91994fd57 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -78,7 +78,7 @@ requires {
lib:libexpat
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_GUTENPRINT_ENABLED
- lib:libgutenprint
+ lib:libgutenprint >= 8
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBICNS_ENABLED
lib:libicns
diff --git a/src/libs/print/libprint/GraphicsDriver.cpp
b/src/libs/print/libprint/GraphicsDriver.cpp
index 5d8b4a789e..013afe6c98 100644
--- a/src/libs/print/libprint/GraphicsDriver.cpp
+++ b/src/libs/print/libprint/GraphicsDriver.cpp
@@ -758,7 +758,6 @@ GraphicsDriver::EndDocument(bool)
void
GraphicsDriver::WriteSpoolData(const void* buffer, size_t size)
- throw (TransportException)
{
if (fTransport == NULL)
return;
@@ -768,7 +767,6 @@ GraphicsDriver::WriteSpoolData(const void* buffer, size_t
size)
void
GraphicsDriver::WriteSpoolString(const char* format, ...)
- throw (TransportException)
{
if (fTransport == NULL)
return;
@@ -784,7 +782,6 @@ GraphicsDriver::WriteSpoolString(const char* format, ...)
void
GraphicsDriver::WriteSpoolChar(char c)
- throw (TransportException)
{
if (fTransport == NULL)
return;
@@ -795,7 +792,6 @@ GraphicsDriver::WriteSpoolChar(char c)
void
GraphicsDriver::ReadSpoolData(void* buffer, size_t size)
- throw (TransportException)
{
if (fTransport == NULL)
return;
@@ -805,7 +801,6 @@ GraphicsDriver::ReadSpoolData(void* buffer, size_t size)
int
GraphicsDriver::ReadSpoolChar()
- throw (TransportException)
{
if (fTransport == NULL)
return -1;
diff --git a/src/libs/print/libprint/Transport.cpp
b/src/libs/print/libprint/Transport.cpp
index 2a047b9785..0aaac88783 100644
--- a/src/libs/print/libprint/Transport.cpp
+++ b/src/libs/print/libprint/Transport.cpp
@@ -137,7 +137,7 @@ Transport::SetLastError(const char *e)
void
-Transport::Write(const void* buffer, size_t size) throw(TransportException)
+Transport::Write(const void* buffer, size_t size)
{
if (fDataStream) {
if (size == (size_t)fDataStream->Write(buffer, size)) {
@@ -150,7 +150,7 @@ Transport::Write(const void* buffer, size_t size)
throw(TransportException)
void
-Transport::Read(void* buffer, size_t size) throw(TransportException)
+Transport::Read(void* buffer, size_t size)
{
if (fDataStream) {
if (size == (size_t)fDataStream->Read(buffer, size)) {
Other related posts:
- » [haiku-commits] haiku: hrev53122 - build/jam/repositories/HaikuPorts src/add-ons/print/drivers/gutenprint docs/develop/build/repositories src headers/libs/print/libprint - waddlesplash
