diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md index a1e5e8a468..f32e838a82 100644 --- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md +++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md @@ -2,7 +2,7 @@ The CBL-Mariner SPEC files originated from a variety of sources with varying lic | Origin | License | Specs | | --- | --- | --- | -| Fedora | [Fedora MIT License Declaration](https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#License_of_Fedora_SPEC_Files) | archivemount
at
atf
attr
augeas
autoconf213
babeltrace2
bmake
brotli
busybox
byacc
calamares
catch
checkpolicy
chrony
collectd
colm
conda
conmon
conntrack-tools
cpprest
cryptsetup
CUnit
Cython
dbus-python
desktop-file-utils
ding-libs
dnf
docbook5-schemas
dos2unix
dpdk
dwarves
dwz
ebtables
extra-cmake-modules
fdupes
firewalld
fmt
fribidi
fuse-zip
fuse3
gcovr
glusterfs
gnu-efi
gsm
hardening-check
heimdal
help2man
hwdata
hyperscan
hyperv-daemons
ipmitool
ipv6calc
iscsi-initiator-utils
isns-utils
javapackages-tools
jemalloc
kde-settings
kexec-tools
kf5
kf5-kconfig
kf5-kcoreaddons
kf5-ki18n
kf5-kwidgetsaddons
kpmcore
kyua
leveldb
libatasmart
libbpf
libburn
libcgroup
libcomps
libdnf
libdrm
libepoxy
libevdev
libfontenc
libglvnd
libICE
libinput
libisoburn
libisofs
libkcapi
liblognorm
libnfs
libpciaccess
libpwquality
libsemanage
libslirp
libSM
libsndfile
libstoragemgmt
liburing
libvirt
libwacom
libX11
libXau
libXaw
libxcb
libxcrypt
libXcursor
libXdamage
libXdmcp
libXext
libXfixes
libXfont2
libXft
libXi
libxkbcommon
libxkbfile
libXmu
libXpm
libXrandr
libXrender
libxshmfence
libXt
libXtst
libXxf86vm
libzip
mailcap
mcstrans
mesa
mokutil
mozjs60
mtdev
nftables
oath-toolkit
opa
open-vm-tools
openssl
p11-kit
p7zip
patchelf
perl-App-cpanminus
perl-CPAN-DistnameInfo
perl-CPAN-Meta-Check
perl-Fedora-VSP
perl-File-pushd
perl-generators
perl-JSON
perl-local-lib
perl-Module-CPANfile
perl-Parse-PMFile
perl-Pod-Parser
perl-String-ShellQuote
picosat
pixman
pkgconf
policycoreutils
prometheus
pugixml
pycairo
pyelftools
python-async-generator
python-conda-package-handling
python-cpuinfo
python-cytoolz
python-fields
python-filelock
python-frozendict
python-google-auth
python-jwt
python-kubernetes
python-mock
python-nose
python-pexpect
python-process-tests
python-ptyprocess
python-pycosat
python-pytest-benchmark
python-pytest-cov
python-pytest-forked
python-pytest-mock
python-pytest-xdist
python-pyudev
python-pywbem
python-responses
python-ruamel-yaml
python-ruamel-yaml-clib
python-sphinx-theme-py3doc-enhanced
python-toolz
python-tqdm
python3-pytest-asyncio
qt5-qtbase
qt5-qtdeclarative
qt5-qtsvg
qt5-qttools
qt5-rpm-macros
ragel
rdma-core
re2
sanlock
secilc
selinux-policy
setools
sgml-common
sos
squashfs-tools
sscg
uclibc-ng
UI-cairo
usbredir
uuid
vitess
vulkan-headers
vulkan-loader
wayland
wayland-protocols
websocketpp
words
xcb-proto
xkeyboard-config
xmlstarlet
xorg-x11-apps
xorg-x11-drv-libinput
xorg-x11-font-utils
xorg-x11-proto-devel
xorg-x11-server
xorg-x11-util-macros
xorg-x11-xauth
xorg-x11-xkb-utils
xorg-x11-xtrans-devel
yajl
yaml-cpp
yasm
zipper | +| Fedora | [Fedora MIT License Declaration](https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#License_of_Fedora_SPEC_Files) | archivemount
at
atf
attr
augeas
autoconf213
babeltrace2
bmake
brotli
busybox
byacc
calamares
catch
checkpolicy
chrony
collectd
colm
conda
conmon
conntrack-tools
cpprest
cryptsetup
CUnit
Cython
dbus-python
desktop-file-utils
ding-libs
dnf
docbook5-schemas
dos2unix
dpdk
dwarves
dwz
ebtables
extra-cmake-modules
fdupes
firewalld
fmt
fribidi
fuse-zip
fuse3
gcovr
glusterfs
gnu-efi
gsm
hardening-check
heimdal
help2man
hwdata
hyperscan
hyperv-daemons
ipmitool
ipv6calc
iscsi-initiator-utils
isns-utils
javapackages-tools
jemalloc
kde-settings
kexec-tools
kf5
kf5-kconfig
kf5-kcoreaddons
kf5-ki18n
kf5-kwidgetsaddons
kpmcore
kyua
leveldb
libatasmart
libbpf
libburn
libcgroup
libcomps
libdnf
libdrm
libepoxy
libevdev
libfontenc
libglvnd
libICE
libinput
libisoburn
libisofs
libkcapi
liblognorm
libnfs
libpciaccess
libpwquality
libsemanage
libslirp
libSM
libsndfile
libstoragemgmt
liburing
libvirt
libwacom
libX11
libXau
libXaw
libxcb
libxcrypt
libXcursor
libXdamage
libXdmcp
libXext
libXfixes
libXfont2
libXft
libXi
libxkbcommon
libxkbfile
libXmu
libXpm
libXrandr
libXrender
libxshmfence
libXt
libXtst
libXxf86vm
libzip
mailcap
mcstrans
mesa
mokutil
mozjs60
mtdev
nftables
oath-toolkit
opa
open-vm-tools
openssl
p11-kit
p7zip
patchelf
perl-App-cpanminus
perl-CPAN-DistnameInfo
perl-CPAN-Meta-Check
perl-Fedora-VSP
perl-File-pushd
perl-generators
perl-JSON
perl-local-lib
perl-Module-CPANfile
perl-Parse-PMFile
perl-Pod-Parser
perl-String-ShellQuote
picosat
pixman
pkgconf
policycoreutils
prometheus
pugixml
pycairo
pyelftools
python-async-generator
python-conda-package-handling
python-cpuinfo
python-cytoolz
python-fields
python-filelock
python-frozendict
python-google-auth
python-jwt
python-kubernetes
python-mock
python-nose
python-pexpect
python-process-tests
python-ptyprocess
python-pycosat
python-pytest-benchmark
python-pytest-cov
python-pytest-forked
python-pytest-mock
python-pytest-xdist
python-pyudev
python-pywbem
python-responses
python-ruamel-yaml
python-ruamel-yaml-clib
python-sphinx-theme-py3doc-enhanced
python-toolz
python-tqdm
python3-pytest-asyncio
qt5-qtbase
qt5-qtdeclarative
qt5-qtsvg
qt5-qttools
qt5-rpm-macros
ragel
rdma-core
re2
sanlock
secilc
selinux-policy
setools
sgml-common
sos
squashfs-tools
sscg
uclibc-ng
usbredir
uuid
vitess
vulkan-headers
vulkan-loader
wayland
wayland-protocols
websocketpp
words
xcb-proto
xkeyboard-config
xmlstarlet
xorg-x11-apps
xorg-x11-drv-libinput
xorg-x11-font-utils
xorg-x11-proto-devel
xorg-x11-server
xorg-x11-util-macros
xorg-x11-xauth
xorg-x11-xkb-utils
xorg-x11-xtrans-devel
yajl
yaml-cpp
yasm
zipper | | Microsoft | [Microsoft MIT License](/LICENSES-AND-NOTICES/LICENSE.md) | application-gateway-kubernetes-ingress
auoms
azure-iot-sdk-c
azure-iotedge
azure-storage-cpp
bazel
blobfuse
bmon
bond
bpftrace
ccache
cert-manager
clamav
cloud-hypervisor
cloud-init-vmware-guestinfo
coredns-1.6.7
coredns-1.7.0
dejavu-fonts
distroless-packages
dtc
espeak-ng
espeakup
flannel
fluent-bit
freefont
gflags
go-md2man
grpc
GSL
helm
installkernel
ivykis
jsonbuilder
keda
kubernetes-1.18.14
kubernetes-1.18.17
kubernetes-1.19.7
kubernetes-1.19.9
kubernetes-1.20.2
kubernetes-1.20.5
libacvp
libconfini
libconfuse
libiothsm-std
libmaxminddb
libuv
libxml++
lsb-release
lttng-consume
lutok
mailcap
mariner-release
mariner-repos
mariner-rpm-macros
mm-common
moby-buildx
moby-cli
moby-containerd
moby-engine
moby-runc
msgpack
ncompress
nlohmann-json
nmap
nmi
node-problem-detector
ntopng
oath-toolkit
pcaudiolib
pcre2
perl-Archive-Zip
perl-Compress-Bzip2
perl-Test-Warnings
perl-Text-Template
pigz
prebuilt-ca-certificates-base
python-cachetools
python-cherrypy
python-execnet
python-logutils
python-nocasedict
python-pecan
python-remoto
python-repoze-lru
python-routes
python-rsa
python-sphinxcontrib-websupport
python-yamlloader
qemu-kvm
R
rocksdb
shim
shim-unsigned
shim-unsigned-aarch64
shim-unsigned-x64
span-lite
swupdate
tinyxml2
toml11
tracelogging
vala
verity-read-only-root
vnstat
zstd | | OpenSUSE | Following [openSUSE guidelines](https://en.opensuse.org/openSUSE:Specfile_guidelines#Specfile_Licensing) | ant
ant-contrib
bazel-workspaces
boringssl
cni
cri-o
envoy
fillup
golang-packaging
jna
kured
libcontainers-common
xcursor-themes | | Photon | [Photon License](LICENSE-PHOTON.md) and [Photon Notice](NOTICE.APACHE2).
Also see [LICENSE-EXCEPTIONS.PHOTON](LICENSE-EXCEPTIONS.PHOTON). | acl
alsa-lib
alsa-utils
ansible
apparmor
apr
apr-util
asciidoc
atftp
audit
autoconf
autoconf-archive
autofs
autogen
automake
babel
bash
bc
bcc
bind
binutils
bison
blktrace
boost
bridge-utils
btrfs-progs
bubblewrap
build-essential
bzip2
c-ares
ca-certificates
cairo
cdrkit
check
chkconfig
chrpath
cifs-utils
clang
cloud-init
cloud-utils-growpart
cmake
cni-plugins
core-packages
coreutils
cpio
cppunit
cracklib
crash
crash-gcore-command
createrepo_c
cri-tools
cronie
ctags
curl
cyrus-sasl
dbus
dbus-glib
dejagnu
device-mapper-multipath
dhcp
dialog
diffutils
dkms
dmidecode
dnsmasq
docbook-dtd-xml
docbook-style-xsl
dosfstools
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
erlang
etcd-3.4.13
etcd-3.4.3
ethtool
expat
expect
fcgi
file
filesystem
findutils
finger
flex
fontconfig
fping
freetype
fuse
gawk
gc
gcc
gdb
gdbm
gettext
git
glib
glib-networking
glibc
glibmm24
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang-1.17
gperf
gperftools
gpgme
gptfdisk
grep
groff
grub2
grub2-efi-binary-signed
gtest
gtk-doc
guile
gzip
haproxy
harfbuzz
haveged
hdparm
http-parser
httpd
i2c-tools
iana-etc
icu
initramfs
initscripts
inotify-tools
intltool
iotop
iperf3
ipmitool
iproute
ipset
iptables
iputils
ipvsadm
ipxe
irqbalance
itstool
jansson
jq
json-c
json-glib
kbd
keepalived
kernel
kernel-headers
kernel-hyperv
kernel-signed
kexec-tools
keyutils
kmod
krb5
lapack
less
libaio
libarchive
libassuan
libatomic_ops
libcap
libcap-ng
libconfig
libdb
libdnet
libedit
libestr
libev
libevent
libfastjson
libffi
libgcrypt
libgpg-error
libgssglue
libgsystem
libgudev
libjpeg-turbo
libksba
liblogging
libmbim
libmnl
libmodulemd
libmpc
libmspack
libndp
libnetfilter_conntrack
libnetfilter_cthelper
libnetfilter_cttimeout
libnetfilter_queue
libnfnetlink
libnftnl
libnl3
libnsl2
libpcap
libpipeline
libpng
libpsl
libqmi
librelp
librepo
librsync
libseccomp
libselinux
libsepol
libserf
libsigc++20
libsolv
libsoup
libssh2
libtalloc
libtar
libtasn1
libtiff
libtirpc
libtool
libunistring
libunwind
libusb
libvirt
libwebp
libxml2
libxslt
libyaml
linux-firmware
lldb
lldpad
llvm
lm-sensors
lmdb
log4cpp
logrotate
lshw
lsof
lsscsi
ltrace
lttng-tools
lttng-ust
lua
lvm2
lz4
lzo
m2crypto
m4
make
man-db
man-pages
mariadb
mc
mercurial
meson
mlocate
ModemManager
mpfr
msr-tools
mysql
nano
nasm
ncurses
ndctl
net-snmp
net-tools
nettle
newt
nfs-utils
nghttp2
nginx
ninja-build
nodejs
npth
nspr
nss
nss-altfiles
ntp
numactl
numpy
nvme-cli
oniguruma
OpenIPMI
openjdk8
openjdk8_aarch64
openldap
openscap
openssh
openvswitch
ostree
pam
pango
parted
patch
pciutils
pcre
perl
perl-Canary-Stability
perl-CGI
perl-common-sense
perl-Crypt-SSLeay
perl-DBD-SQLite
perl-DBI
perl-DBIx-Simple
perl-Exporter-Tiny
perl-File-HomeDir
perl-File-Which
perl-IO-Socket-SSL
perl-JSON-Any
perl-JSON-XS
perl-libintl-perl
perl-List-MoreUtils
perl-Module-Build
perl-Module-Install
perl-Module-ScanDeps
perl-Net-SSLeay
perl-NetAddr-IP
perl-Object-Accessor
perl-Path-Class
perl-Try-Tiny
perl-Types-Serialiser
perl-WWW-Curl
perl-XML-Parser
perl-YAML
perl-YAML-Tiny
pgbouncer
pinentry
polkit
popt
postgresql
powershell
procps-ng
protobuf
protobuf-c
psmisc
pth
pyasn1-modules
pygobject3
pyOpenSSL
PyPAM
pyparsing
pytest
python-appdirs
python-asn1crypto
python-atomicwrites
python-attrs
python-backports-ssl_match_hostname
python-bcrypt
python-boto3
python-botocore
python-certifi
python-cffi
python-chardet
python-configobj
python-constantly
python-coverage
python-cryptography
python-daemon
python-dateutil
python-defusedxml
python-distro
python-docopt
python-docutils
python-ecdsa
python-enum34
python-futures
python-gevent
python-greenlet
python-hyperlink
python-hypothesis
python-idna
python-imagesize
python-incremental
python-iniparse
python-ipaddr
python-ipaddress
python-jinja2
python-jmespath
python-jsonpatch
python-jsonpointer
python-jsonschema
python-lockfile
python-lxml
python-m2r
python-mako
python-markupsafe
python-mistune
python-msgpack
python-netaddr
python-netifaces
python-ntplib
python-oauthlib
python-packaging
python-pam
python-pbr
python-pip
python-ply
python-prettytable
python-psutil
python-psycopg2
python-py
python-pyasn1
python-pycodestyle
python-pycparser
python-pycurl
python-pygments
python-pynacl
python-pyvmomi
python-requests
python-setuptools
python-setuptools_scm
python-simplejson
python-six
python-snowballstemmer
python-sphinx
python-sphinx-theme-alabaster
python-sqlalchemy
python-twisted
python-typing
python-urllib3
python-vcversioner
python-virtualenv
python-wcwidth
python-webob
python-websocket-client
python-werkzeug
python-zope-interface
python2
python3
pytz
PyYAML
rapidjson
readline
redis
rng-tools
rpcbind
rpcsvc-proto
rpm
rpm-ostree
rrdtool
rsync
rsyslog
ruby
rubygem-bundler
rust
scons
sed
sg3_utils
shadow-utils
slang
snappy
socat
sqlite
sshpass
strace
strongswan
subversion
sudo
swig
syslinux
syslog-ng
sysstat
systemd
systemd-bootstrap
systemtap
tar
tboot
tcl
tcp_wrappers
tcpdump
tcsh
tdnf
telegraf
texinfo
tmux
tpm2-abrmd
tpm2-tools
tpm2-tss
traceroute
tree
trousers
tzdata
unbound
unixODBC
unzip
usbutils
userspace-rcu
utf8proc
util-linux
valgrind
vim
vsftpd
WALinuxAgent
wget
which
wpa_supplicant
xerces-c
xfsprogs
xinetd
xmlsec1
xmlto
xz
zchunk
zeromq
zip
zlib
zsh | diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json index 5a3a83dcd5..e743c633b2 100644 --- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json +++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json @@ -210,7 +210,6 @@ "squashfs-tools", "sscg", "uclibc-ng", - "UI-cairo", "usbredir", "uuid", "vitess", diff --git a/SPECS/UI-cairo/0001-Set-default-LCD-filter-to-FreeType-s-default.patch b/SPECS/UI-cairo/0001-Set-default-LCD-filter-to-FreeType-s-default.patch deleted file mode 100644 index 854eb0e1c4..0000000000 --- a/SPECS/UI-cairo/0001-Set-default-LCD-filter-to-FreeType-s-default.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 12a5b7384f35d9a3f4c6b151fac4857444db3d6a Mon Sep 17 00:00:00 2001 -From: Nikolaus Waxweiler -Date: Sat, 10 Nov 2018 16:44:23 +0000 -Subject: [PATCH] Set default LCD filter to FreeType's default - ---- - src/cairo-ft-font.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61b4..3c47dc12e 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -1404,7 +1404,7 @@ _render_glyph_outline (FT_Face face, - cairo_image_surface_t **surface) - { - int rgba = FC_RGBA_UNKNOWN; -- int lcd_filter = FT_LCD_FILTER_LEGACY; -+ int lcd_filter = FT_LCD_FILTER_DEFAULT; - FT_GlyphSlot glyphslot = face->glyph; - FT_Outline *outline = &glyphslot->outline; - FT_Bitmap bitmap; -@@ -1439,13 +1439,13 @@ _render_glyph_outline (FT_Face face, - case CAIRO_LCD_FILTER_NONE: - lcd_filter = FT_LCD_FILTER_NONE; - break; -- case CAIRO_LCD_FILTER_DEFAULT: - case CAIRO_LCD_FILTER_INTRA_PIXEL: - lcd_filter = FT_LCD_FILTER_LEGACY; - break; - case CAIRO_LCD_FILTER_FIR3: - lcd_filter = FT_LCD_FILTER_LIGHT; - break; -+ case CAIRO_LCD_FILTER_DEFAULT: - case CAIRO_LCD_FILTER_FIR5: - lcd_filter = FT_LCD_FILTER_DEFAULT; - break; -@@ -3416,7 +3416,6 @@ _cairo_ft_font_options_substitute (const cairo_font_options_t *options, - case CAIRO_LCD_FILTER_NONE: - lcd_filter = FT_LCD_FILTER_NONE; - break; -- case CAIRO_LCD_FILTER_DEFAULT: - case CAIRO_LCD_FILTER_INTRA_PIXEL: - lcd_filter = FT_LCD_FILTER_LEGACY; - break; -@@ -3424,6 +3423,7 @@ _cairo_ft_font_options_substitute (const cairo_font_options_t *options, - lcd_filter = FT_LCD_FILTER_LIGHT; - break; - default: -+ case CAIRO_LCD_FILTER_DEFAULT: - case CAIRO_LCD_FILTER_FIR5: - lcd_filter = FT_LCD_FILTER_DEFAULT; - break; --- -2.19.1 - diff --git a/SPECS/UI-cairo/0001-cff-Allow-empty-array-of-operands-for-certain-operat.patch b/SPECS/UI-cairo/0001-cff-Allow-empty-array-of-operands-for-certain-operat.patch deleted file mode 100644 index ac9784b409..0000000000 --- a/SPECS/UI-cairo/0001-cff-Allow-empty-array-of-operands-for-certain-operat.patch +++ /dev/null @@ -1,116 +0,0 @@ -From ef959bc76e65ea0b0d4ba3ee50dfbce31c3484ad Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: Fri, 27 Mar 2020 19:39:46 +0100 -Subject: [PATCH] cff: Allow empty array of operands for certain operators - -Operators BlueValues, OtherBlues, FamilyBlues, FamilyOtherBlues, -StemSnapH and StemSnapV have operands of type delta which can be -a number or an array of delta-encoded numbers. This array can be -empty according to freetype developers. -This commit checks whether current operator is among those listed -and permits empty operand in such case. ---- - src/cairo-cff-subset.c | 78 ++++++++++++++++++++++++++---------------- - 1 file changed, 49 insertions(+), 29 deletions(-) - -diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c -index 37727eddb..fce4195e9 100644 ---- a/src/cairo-cff-subset.c -+++ b/src/cairo-cff-subset.c -@@ -56,30 +56,36 @@ - - /* CFF Dict Operators. If the high byte is 0 the command is encoded - * with a single byte. */ --#define BASEFONTNAME_OP 0x0c16 --#define CIDCOUNT_OP 0x0c22 --#define CHARSET_OP 0x000f --#define CHARSTRINGS_OP 0x0011 --#define COPYRIGHT_OP 0x0c00 --#define DEFAULTWIDTH_OP 0x0014 --#define ENCODING_OP 0x0010 --#define FAMILYNAME_OP 0x0003 --#define FDARRAY_OP 0x0c24 --#define FDSELECT_OP 0x0c25 --#define FONTBBOX_OP 0x0005 --#define FONTMATRIX_OP 0x0c07 --#define FONTNAME_OP 0x0c26 --#define FULLNAME_OP 0x0002 --#define LOCAL_SUB_OP 0x0013 --#define NOMINALWIDTH_OP 0x0015 --#define NOTICE_OP 0x0001 --#define POSTSCRIPT_OP 0x0c15 --#define PRIVATE_OP 0x0012 --#define ROS_OP 0x0c1e --#define UNIQUEID_OP 0x000d --#define VERSION_OP 0x0000 --#define WEIGHT_OP 0x0004 --#define XUID_OP 0x000e -+#define BASEFONTNAME_OP 0x0c16 -+#define CIDCOUNT_OP 0x0c22 -+#define CHARSET_OP 0x000f -+#define CHARSTRINGS_OP 0x0011 -+#define COPYRIGHT_OP 0x0c00 -+#define DEFAULTWIDTH_OP 0x0014 -+#define ENCODING_OP 0x0010 -+#define FAMILYNAME_OP 0x0003 -+#define FDARRAY_OP 0x0c24 -+#define FDSELECT_OP 0x0c25 -+#define FONTBBOX_OP 0x0005 -+#define FONTMATRIX_OP 0x0c07 -+#define FONTNAME_OP 0x0c26 -+#define FULLNAME_OP 0x0002 -+#define LOCAL_SUB_OP 0x0013 -+#define NOMINALWIDTH_OP 0x0015 -+#define NOTICE_OP 0x0001 -+#define POSTSCRIPT_OP 0x0c15 -+#define PRIVATE_OP 0x0012 -+#define ROS_OP 0x0c1e -+#define UNIQUEID_OP 0x000d -+#define VERSION_OP 0x0000 -+#define WEIGHT_OP 0x0004 -+#define XUID_OP 0x000e -+#define BLUEVALUES_OP 0x0006 -+#define OTHERBLUES_OP 0x0007 -+#define FAMILYBLUES_OP 0x0008 -+#define FAMILYOTHERBLUES_OP 0x0009 -+#define STEMSNAPH_OP 0x0c0c -+#define STEMSNAPV_OP 0x0c0d - - #define NUM_STD_STRINGS 391 - -@@ -615,13 +621,27 @@ cff_dict_create_operator (int operator, - return _cairo_error (CAIRO_STATUS_NO_MEMORY); - - _cairo_dict_init_key (op, operator); -- op->operand = _cairo_malloc (size); -- if (unlikely (op->operand == NULL)) { -- free (op); -- return _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ if (size != 0) { -+ op->operand = _cairo_malloc (size); -+ if (unlikely (op->operand == NULL)) { -+ free (op); -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ } -+ memcpy (op->operand, operand, size); -+ } else { -+ op->operand = NULL; -+ /* Delta-encoded arrays can be empty. */ -+ if (operator != BLUEVALUES_OP && -+ operator != OTHERBLUES_OP && -+ operator != FAMILYBLUES_OP && -+ operator != FAMILYOTHERBLUES_OP && -+ operator != STEMSNAPH_OP && -+ operator != STEMSNAPV_OP) { -+ free (op); -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ } - } - -- memcpy (op->operand, operand, size); - op->operand_length = size; - op->operand_offset = -1; - --- -2.26.0 - diff --git a/SPECS/UI-cairo/CVE-2018-19876.patch b/SPECS/UI-cairo/CVE-2018-19876.patch deleted file mode 100644 index 3709c5a90f..0000000000 --- a/SPECS/UI-cairo/CVE-2018-19876.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos -Date: Mon, 19 Nov 2018 12:33:07 +0100 -Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in - cairo_ft_apply_variations - -Fixes a crash when using freetype >= 2.9 ---- - src/cairo-ft-font.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61b4..981973f78 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -2393,7 +2393,11 @@ skip: - done: - free (coords); - free (current_coords); -+#if HAVE_FT_DONE_MM_VAR -+ FT_Done_MM_Var (face->glyph->library, ft_mm_var); -+#else - free (ft_mm_var); -+#endif - } - } - --- -2.19.2 - diff --git a/SPECS/UI-cairo/UI-cairo.signatures.json b/SPECS/UI-cairo/UI-cairo.signatures.json deleted file mode 100644 index f4d5a288ac..0000000000 --- a/SPECS/UI-cairo/UI-cairo.signatures.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "Signatures": { - "cairo-1.16.0.tar.xz": "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331" - } -} \ No newline at end of file diff --git a/SPECS/UI-cairo/UI-cairo.spec b/SPECS/UI-cairo/UI-cairo.spec deleted file mode 100644 index 21e6528fc3..0000000000 --- a/SPECS/UI-cairo/UI-cairo.spec +++ /dev/null @@ -1,784 +0,0 @@ -%define tarname cairo -%define pixman_version 0.30.0 -%define freetype_version 2.1.9 -%define fontconfig_version 2.2.95 - -# This version of "cairo" uses the same sources as the "regular" one but builds -# with a dependency on some X11 and other graphics-related libraries, producing -# same-named binaries as the "regular" version, thus the "UI-" prefix. -# Due to this conflict "cairo*" and "UI-cairo*" packages CANNOT be installed -# on a single system. -Summary: A 2D graphics library (UI libs dependent) -Name: UI-cairo -Version: 1.16.0 -Release: 13%{?dist} -# The sources for 'cairo' itself are available under the (LGPLv2 OR MPLv1.1) license. -# Test code and fonts are available under either the MIT or Public Domain license. -# The 'cairo-trace' tools are released under the GPLv3 license - 'License' tag added separately for that subpackage. -License: (LGPLv2 OR MPLv1.1) AND MIT AND Public Domain -Vendor: Microsoft Corporation -Distribution: Mariner -URL: https://cairographics.org -Source0: https://cairographics.org/releases/%{tarname}-%{version}.tar.xz - -Patch3: cairo-multilib.patch -# https://gitlab.freedesktop.org/cairo/cairo/merge_requests/1 -Patch4: 0001-Set-default-LCD-filter-to-FreeType-s-default.patch -# https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5 -Patch5: CVE-2018-19876.patch -# https://github.com/matthiasclasen/cairo/commit/79ad01724161502e8d9d2bd384ff1f0174e5df6e -Patch6: cairo-composite_color_glyphs.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1817958 -Patch7: 0001-cff-Allow-empty-array-of-operands-for-certain-operat.patch - -BuildRequires: fontconfig-devel >= %{fontconfig_version} -BuildRequires: freetype-devel >= %{freetype_version} -BuildRequires: gcc -BuildRequires: glib-devel -BuildRequires: libX11-devel -BuildRequires: libXrender-devel -BuildRequires: libpng-devel -BuildRequires: libxml2-devel -BuildRequires: pixman-devel >= %{pixman_version} -BuildRequires: pkg-config -BuildRequires: pkgconfig(xext) - -Requires: expat -Requires: glib -Requires: libpng -Requires: pixman - -Conflicts: cairo - -%description -Cairo is a 2D graphics library designed to provide high-quality display -and print output. Currently supported output targets include the X Window -System, in-memory image buffers, and image files (PDF, PostScript, and SVG). - -Cairo is designed to produce consistent output on all output media while -taking advantage of display hardware acceleration when available. - -NOTE: this is an extended version of 'cairo' built with multiple dependencies on X11 -and other graphics-related libraries compiled into its binaries. It CONFLICTS -with the non-UI version. - -%package devel -Summary: Development files for cairo -License: (LGPLv2 OR MPLv1.1) AND MIT AND Public Domain - -Conflicts: cairo-devel - -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: fontconfig-devel -Requires: freetype-devel -Requires: libpng-devel -Requires: pixman-devel - -Provides: pkconfig(cairo-fc) = %{version}-%{release} -Provides: pkconfig(cairo-ft) = %{version}-%{release} -Provides: pkconfig(cairo) = %{version}-%{release} -Provides: pkconfig(cairo-pdf) = %{version}-%{release} -Provides: pkconfig(cairo-png) = %{version}-%{release} -Provides: pkconfig(cairo-ps) = %{version}-%{release} -Provides: pkconfig(cairo-svg) = %{version}-%{release} -Provides: pkconfig(cairo-tee) = %{version}-%{release} -Provides: pkconfig(cairo-xlib) = %{version}-%{release} -Provides: pkconfig(cairo-xlib-xrender) = %{version}-%{release} -Provides: pkconfig(cairo-script) = %{version}-%{release} -Provides: pkconfig(cairo-xcb-shm) = %{version}-%{release} -Provides: pkconfig(cairo-xcb) = %{version}-%{release} - -%description devel -Cairo is a 2D graphics library designed to provide high-quality display -and print output. - -This package contains libraries, header files and developer documentation -needed for developing software which uses the cairo graphics library. - -%package gobject -Summary: GObject bindings for cairo -License: (LGPLv2 OR MPLv1.1) AND MIT AND Public Domain - -Conflicts: cairo-gobject - -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description gobject -Cairo is a 2D graphics library designed to provide high-quality display -and print output. - -This package contains functionality to make cairo graphics library -integrate well with the GObject object system used by GNOME. - -%package gobject-devel -Summary: Development files for cairo-gobject -License: (LGPLv2 OR MPLv1.1) AND MIT AND Public Domain - -Conflicts: cairo-gobject-devel - -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-gobject%{?_isa} = %{version}-%{release} - -Provides: pkconfig(cairo-gobject) = %{version}-%{release} - -%description gobject-devel -Cairo is a 2D graphics library designed to provide high-quality display -and print output. - -This package contains libraries, header files and developer documentation -needed for developing software which uses the cairo Gobject library. - -%package tools -Summary: Development tools for cairo -License: GPLv3 - -Conflicts: cairo-tools - -%description tools -Cairo is a 2D graphics library designed to provide high-quality display -and print output. - -This package contains tools for working with the cairo graphics library. - * cairo-trace: Record cairo library calls for later playback - -%prep -%autosetup -p1 -n %{tarname}-%{version} - -%build -%configure \ - --disable-gl \ - --disable-gtk-doc \ - --disable-static \ - --disable-symbol-lookup \ - --enable-ft \ - --enable-gobject \ - --enable-pdf \ - --enable-ps \ - --enable-svg \ - --enable-tee \ - --enable-xlib - -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make V=1 %{?_smp_mflags} - -%install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%files -%license COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 -%doc AUTHORS BIBLIOGRAPHY BUGS NEWS README -%{_libdir}/libcairo.so.* -%{_libdir}/libcairo-script-interpreter.so.* -%{_bindir}/cairo-sphinx - -%files devel -%doc ChangeLog PORTING_GUIDE -%dir %{_includedir}/cairo/ -%{_includedir}/cairo/cairo-deprecated.h -%{_includedir}/cairo/cairo-features.h -%{_includedir}/cairo/cairo-ft.h -%{_includedir}/cairo/cairo.h -%{_includedir}/cairo/cairo-pdf.h -%{_includedir}/cairo/cairo-ps.h -%{_includedir}/cairo/cairo-script-interpreter.h -%{_includedir}/cairo/cairo-svg.h -%{_includedir}/cairo/cairo-tee.h -%{_includedir}/cairo/cairo-version.h -%{_includedir}/cairo/cairo-xlib-xrender.h -%{_includedir}/cairo/cairo-xlib.h -%{_includedir}/cairo/cairo-script.h -%{_includedir}/cairo/cairo-xcb.h -%{_libdir}/libcairo.so -%{_libdir}/libcairo-script-interpreter.so -%{_libdir}/pkgconfig/cairo-fc.pc -%{_libdir}/pkgconfig/cairo-ft.pc -%{_libdir}/pkgconfig/cairo.pc -%{_libdir}/pkgconfig/cairo-pdf.pc -%{_libdir}/pkgconfig/cairo-png.pc -%{_libdir}/pkgconfig/cairo-ps.pc -%{_libdir}/pkgconfig/cairo-svg.pc -%{_libdir}/pkgconfig/cairo-tee.pc -%{_libdir}/pkgconfig/cairo-xlib.pc -%{_libdir}/pkgconfig/cairo-xlib-xrender.pc -%{_libdir}/pkgconfig/cairo-script.pc -%{_libdir}/pkgconfig/cairo-xcb-shm.pc -%{_libdir}/pkgconfig/cairo-xcb.pc -%{_datadir}/gtk-doc/html/cairo - -%files gobject -%{_libdir}/libcairo-gobject.so.* - -%files gobject-devel -%{_includedir}/cairo/cairo-gobject.h -%{_libdir}/libcairo-gobject.so -%{_libdir}/pkgconfig/cairo-gobject.pc - -%files tools -%license util/cairo-trace/COPYING util/cairo-trace/COPYING-GPL-3 -%{_bindir}/cairo-trace -%{_libdir}/cairo/ - -%changelog -* Thu Sep 16 2021 Pawel Winogrodzki - 1.16.0-13 -- Disabling "symbol-lookup" feature due to compilation errors. - -* Thu Jun 10 2021 Pawel Winogrodzki - 1.16.0-12 -- Added missing 'Conflicts' for all 'cairo' subpackges. - -* Tue Apr 20 2021 Henry Li - 1.16.0-11 -- Add pixman, glib, libpng and expat as runtime requirement for UI-cairo -- Add freetype-devel, pixman-devel, libpng-devel and fontconfig-devel as runtime requirements for UI-cairo-devel - -* Tue Jan 19 2021 Pawel Winogrodzki - 1.16.0-10 -- Initial CBL-Mariner import from Fedora 33 (license: MIT). -- License verified. -- Removing BR on "librsvg2-devel" missing in CBL-Mariner. This disables build-time tests for SVG. -- Renamed package to "UI-cairo" to avoid conflicts with core CBL-Mariner's version of "cairo". -- Renamed patch file for a CVE-2018-19876 fix to align it with CBL-Mariner's tooling. -- Added "GPLv3" license for the '*-tools' subpackage. -- Added explicit "Provides" for "pkgconfig(*)". -- Added explicit calls to ldconfig. -- Added missing BR on "pkgconfig(xext)". - -* Mon Jul 27 2020 Fedora Release Engineering - 1.16.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Apr 24 2020 Marek Kasik - 1.16.0-8 -- Allow empty array of operands for certain operators in CFF fonts -- Resolves: #1817958 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.16.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.16.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jun 03 2019 Kalev Lember - 1.16.0-5 -- Fix a thinko in composite_color_glyphs - -* Thu Jan 31 2019 Fedora Release Engineering - 1.16.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Dec 7 2018 Marek Kasik - 1.16.0-3 -- Use FT_Done_MM_Var instead of free when available in -- cairo_ft_apply_variations - -* Fri Dec 7 2018 Marek Kasik - 1.16.0-2 -- Set default LCD filter to FreeType's default -- Resolves: #1645763 - -* Mon Oct 22 2018 Kalev Lember - 1.16.0-1 -- Update to 1.16.0 - -* Sat Sep 22 2018 Kalev Lember - 1.15.14-1 -- Update to 1.15.14 -- Drop ldconfig scriptlets - -* Thu Jul 12 2018 Fedora Release Engineering - 1.15.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Apr 21 2018 Kalev Lember - 1.15.12-2 -- Fix assertion failure in the freetype backend (#1567633) - -* Thu Apr 12 2018 Kalev Lember - 1.15.12-1 -- Update to 1.15.12 - -* Mon Mar 19 2018 Adam Jackson - 1.15.10-5 -- Update the description to reflect dropping the OpenGL backend. - -* Thu Mar 15 2018 Adam Jackson - 1.15.10-4 -- Drop cairo-gl in RHEL too. - -* Wed Feb 07 2018 Fedora Release Engineering - 1.15.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Feb 03 2018 Igor Gnatenko - 1.15.10-2 -- Switch to %%ldconfig_scriptlets - -* Tue Dec 12 2017 Kalev Lember - 1.15.10-1 -- Update to 1.15.10 - -* Thu Aug 31 2017 Kalev Lember - 1.15.8-1 -- Update to 1.15.8 - -* Wed Aug 02 2017 Fedora Release Engineering - 1.14.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.14.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jul 13 2017 Adam Jackson - 1.14.10-2 -- Disable cairo-gl in F27+ - -* Fri Jun 16 2017 Kalev Lember - 1.14.10-1 -- Update to 1.14.10 - -* Wed Apr 19 2017 Kalev Lember - 1.14.8-3 -- Remove all libtool .la files from cairo private directories as well - -* Fri Feb 10 2017 Fedora Release Engineering - 1.14.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Dec 08 2016 Kalev Lember - 1.14.8-1 -- Update to 1.14.8 - -* Mon Jul 25 2016 Kalev Lember - 1.14.6-2 -- xlib: Fix double free in _get_image_surface() (#1331021) -- Minor spec file cleanups - -* Mon Apr 04 2016 Kalev Lember - 1.14.6-1 -- Update to 1.14.6 - -* Wed Feb 03 2016 Fedora Release Engineering - 1.14.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Oct 31 2015 Kalev Lember - 1.14.4-1 -- Update to 1.14.4 -- Use license macro for COPYING* - -* Wed Jun 17 2015 Fedora Release Engineering - 1.14.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Mar 11 2015 Kalev Lember - 1.14.2-1 -- Update to 1.14.2 - -* Sat Feb 21 2015 Till Maas - 1.14.0-3 -- Rebuilt for Fedora 23 Change - https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code - -* Thu Jan 29 2015 Kevin Fenzi 1.14.0-2 -- Add patch to fix crashes in dot. Fixes bug #1183242 - -* Sun Nov 23 2014 Kalev Lember - 1.14.0-1 -- Update to 1.14.0 - -* Tue Oct 14 2014 Kalev Lember - 1.13.1-0.5.git337ab1f -- Minor spec file cleanup: -- Drop manual -devel subpackage deps -- Tighten deps with the _isa macro - -* Fri Aug 15 2014 Fedora Release Engineering - 1.13.1-0.4.git337ab1f -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jul 11 2014 Peter Robinson 1.13.1-0.3.git337ab1f -- Enable make check but don't (currently) fail the build on failure - -* Fri Jun 6 2014 Peter Robinson 1.13.1-0.2.git337ab1f -- Compile with -flto -ffat-lto-objects CFLAGS to fix FTBFSF with gcc 4.9 - -* Tue Sep 17 2013 Kalev Lember - 1.13.1-0.1.git337ab1f -- Update to 1.13.1 git snapshot for device scale support - -* Wed Aug 28 2013 Kalev Lember - 1.12.16-1 -- Update to 1.12.16 - -* Sat Aug 03 2013 Fedora Release Engineering - 1.12.14-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jul 18 2013 Matthias Clasen 1.12.14-3 -- Fix a multilib issue in /usr/bin/cairo-trace - -* Sat May 25 2013 Kalev Lember 1.12.14-2 -- Backport an upstream patch for eog get_buddy() crashes (#912030) - -* Tue Feb 12 2013 Adam Jackson 1.12.14-1 -- cairo 1.12.14 - -* Mon Jan 28 2013 Adam Jackson 1.12.10-2 -- cairo-1.12.10-xlib-regression-fix.patch: Fix a regression caused by - mit-shm surfaces. - -* Wed Jan 16 2013 Adam Jackson 1.12.10-1 -- cairo 1.12.10 -- 0001-xlib-shm-Fix-memory-leak.patch: Drop, merged. - -* Wed Jan 2 2013 Matthias Clasen - 1.12.8-3 -- Make inter-subpackage deps explicit - -* Tue Dec 18 2012 Adam Jackson 1.12.8-2 -- 0001-xlib-shm-Fix-memory-leak.patch: Fix a memory leak with shm image - surfaces. (#882976) - -* Mon Nov 5 2012 Matthias Clasen - 1.12.8-1 -- Update to 1.12.8, including a fix for screenshots in fallback mode - -* Wed Oct 31 2012 Adam Jackson 1.12.6-2 -- *-x{c,li}b-Don-t-crash-when-swapping-a-0-sized-glyph.patch: Fix some - crashes when client and server endian don't match. - -* Thu Oct 25 2012 Kalev Lember - 1.12.6-1 -- Update to 1.12.6 - -* Fri Oct 12 2012 Matthias Clasen - 1.12.4-1 -- 1.12.4 -- drop obsolete patch - -* Wed Sep 19 2012 Thorsten Leemhuis - 1.12.2-4.1 -- rebuild for f18 - -* Tue Sep 18 2012 Thorsten Leemhuis - 1.12.2-4 -- add patch from master to fix issues with weston - -* Wed Jul 18 2012 Fedora Release Engineering - 1.12.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jul 14 2012 Ville Skyttä - 1.12.2-2 -- Add ldconfig scriptlet calls to -gobject. -- Fix rpmlint's spaces vs tabs warnings. - -* Fri May 18 2012 Matthias Clasen - 1.12.2-1 -- Update to 1.12.2 - -* Tue Apr 24 2012 Richard Hughes - 1.12.0-1 -- Update to latest stable release -- Enable the GL backend - -* Thu Mar 15 2012 Benjamin Otte - 1.10.2-7 -- Add patch to make eclipse not crash (#803878) - -* Thu Jan 12 2012 Fedora Release Engineering - 1.10.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Dec 05 2011 Adam Jackson 1.10.2-5 -- Rebuild for new libpng - -* Fri Jul 01 2011 Rex Dieter 1.10.2-4 -- cairo-devel doesn't own /usr/include/cairo (#716611) - -* Tue Feb 08 2011 Fedora Release Engineering - 1.10.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 24 2011 Christopher Aillon - 1.10.2-2 -- Enable tee support - -* Mon Jan 03 2011 Benjamin Otte - 1.10.2-1 -- Update to 1.10.2 - -* Thu Nov 11 2010 Tom "spot" Callaway - 1.10.0-4 -- add missing BuildRequires: librsvg2 for SVG support - -* Wed Sep 29 2010 jkeating - 1.10.0-3 -- Rebuilt for gcc bug 634757 - -* Thu Sep 16 2010 Matthias Clasen - 1.10.0-2 -- Drop the explicit dep on the wrong package from -gobject-devel - -* Tue Sep 07 2010 Benjamin Otte - 1.10.0-1 -- Update to 1.10.0 -- Add cairo-gobject package - -* Mon Jul 26 2010 Benjamin Otte - 1.9.14-1 -- Update to 1.9.14 snapshot - -* Sun Jul 04 2010 Benjamin Otte - 1.9.12-1 -- Update to 1.9.12 snapshot -- Remove now unnecessary patch - -* Sun Jul 04 2010 Benjamin Otte - 1.9.10-3 -- Add patch to force linking with gcc, not g++. (#606523) - -* Sun Jul 04 2010 Benjamin Otte - 1.9.10-2 -- Don't use silent rules, we want verbose output in builders - -* Sun Jun 27 2010 Benjamin Otte - 1.9.10-1 -- Update to 1.9.10 snapshot - -* Thu Jun 17 2010 Benjamin Otte - 1.9.8-1 -- Update to 1.9.8 snapshot - -* Sun Feb 21 2010 Matthias Clasen - 1.8.10-1 -- Update to 1.8.10 - -* Sun Aug 2 2009 Matthias Clasen - 1.8.8-3 -- Move ChangeLog to -devel to save space - -* Fri Jul 24 2009 Fedora Release Engineering - 1.8.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jun 17 2009 Matthias Clasen 1.8.8-1 -- Update to 1.8.8 - -* Wed Apr 08 2009 Adam Jackson 1.8.6-3 -- cairo-1.8.6-repeat-modes.patch: Enable the repeat and pad blend modes in - the xlib backend to make firefox performance slightly less dire. - -* Mon Feb 23 2009 Fedora Release Engineering - 1.8.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Jan 7 2009 Matthias Clasen 1.8.6-1 -- Update to 1.8.6 - -* Sun Dec 14 2008 Mamoru Tasaka 1.8.0-3 -- Rebuild for pkgconfig provides - -* Fri Nov 21 2008 Matthias Clasen 1.8.0-2 -- Tweak %%summary and %%documentation - -* Thu Sep 25 2008 Behdad Esfahbod 1.8.0-1 -- Update to 1.8.0 -- Update dep versions - -* Mon Sep 22 2008 Behdad Esfahbod 1.7.6-1 -- Update to 1.7.6 - -* Mon Aug 11 2008 Matthias Clasen 1.7.4-1 -- Update to 1.7.4 - -* Wed May 21 2008 Tom "spot" Callaway 1.6.4-3 -- fix license tag - -* Sun May 4 2008 Matthias Clasen 1.6.4-2 -- Fix source url - -* Fri Apr 11 2008 Carl Worth 1.6.2-1 -- Update to 1.6.2 - -* Thu Apr 10 2008 Carl Worth 1.6.0-1 -- Update to 1.6.0 - -* Tue Apr 8 2008 Carl Worth 1.5.20-1 -- Update to 1.5.20 - -* Sun Apr 6 2008 Carl Worth 1.5.18-1 -- Update to 1.5.18 - -* Thu Apr 3 2008 Matthias Clasen 1.5.16-1 -- Update to 1.5.16 - -* Fri Mar 21 2008 Matthias Clasen 1.5.14-1 -- Update to 1.5.14 - -* Wed Feb 20 2008 Behdad Esfahbod -- Point Source to cairographics.org/snapshots. Change back to /releases - when 1.6.0 is out. - -* Wed Jan 30 2008 Behdad Esfahbod 1.5.8-2 -- Remove TODO and ROADMAP as they were removed from tarball upstream. - -* Wed Jan 30 2008 Behdad Esfahbod 1.5.8-1 -- Update to 1.5.8 - -* Thu Jan 17 2008 Behdad Esfahbod 1.5.6-1 -- Update to 1.5.6 - -* Thu Dec 6 2007 Matthias Clasen - 1.5.4-1 -- Update to 1.5.4 - -* Wed Oct 31 2007 Behdad Esfahbod 1.5.2-1 -- Update to 1.5.2 -- Switch to external pixman. - -* Wed Aug 22 2007 Adam Jackson - 1.4.10-2 -- Rebuild for PPC toolchain bug - -* Wed Jun 27 2007 Carl Worth 1.4.10-1 -- Update to 1.4.10 - -* Sat Jun 9 2007 Behdad Esfahbod 1.4.8-1 -- Update to 1.4.8 - -* Tue May 1 2007 Carl Worth 1.4.6-1 -- Update to 1.4.6 - -* Mon Apr 16 2007 Carl Worth 1.4.4-1 -- Update to 1.4.4 - -* Tue Mar 20 2007 Carl Worth 1.4.2-1 -- Update to 1.4.2 - -* Tue Mar 6 2007 Carl Worth 1.4.0-1 -- Update to 1.4.0 - -* Wed Feb 14 2007 Carl Worth 1.3.14-1 -- Update to 1.3.14 - -* Sat Jan 20 2007 Carl Worth 1.3.12-1 -- Update to 1.3.12 - -* Sat Dec 23 2006 Carl Worth 1.3.10-1 -- Update to 1.3.10 - -* Thu Dec 14 2006 Carl Worth 1.3.8-1 -- Update to 1.3.8 - -* Sat Dec 9 2006 Matthias Clasen 1.3.6-2 -- Small spec file cleanups - -* Wed Dec 6 2006 Matthias Clasen 1.3.6-1 -- Update to 1.3.6 - -* Thu Nov 23 2006 Matthias Clasen 1.3.4-1 -- Update to 1.3.4 - -* Wed Nov 15 2006 Carl Worth 1.3.2-1 -- Update to 1.3.2 - -* Sun Nov 5 2006 Matthias Clasen 1.2.6-1 -- Update to 1.2.6 - -* Sun Aug 20 2006 Behdad Esfahbod 1.2.4-1 -- Update to 1.2.4 -- Drop libXt-devel BuildReq as it shouldn't need it anymore. - -* Wed Aug 9 2006 Behdad Esfahbod 1.2.2-3 -- Remove unnecessary --disable-* arguments to configure, add --enable-* - for those backends we really want to make sure are enabled. - -* Wed Aug 9 2006 Ray Strode - 1.2.2-2 -- add lame libXt-devel BuildReq to get things building again. -- small spec tweaks to follow conventions - -* Wed Aug 9 2006 Behdad Esfahbod 1.2.2-1 -- Update to 1.2.2 - -* Tue Jul 18 2006 Matthias Clasen - 1.2.0-2 -- rebuild - -* Wed Jul 12 2006 Jesse Keating - 1.2.0-1.1 -- rebuild - -* Mon Jul 3 2006 Matthias Clasen 1.2.0-1 -- Update to 1.2.0 - -* Fri Jun 16 2006 Carl Worth 1.1.10-1 -- Update to 1.1.10 (fixes crash on 16-bit X servers like Xvnc) - -* Wed Jun 14 2006 Matthias Clasen 1.1.8-1 -- Update to 1.1.8 - -* Tue May 16 2006 Karsten Hopp 1.1.6-6 -- buildrequire libxml2-devel - -* Fri May 5 2006 Carl Worth - 1.1.6-2 -- Refuse to build pdf2svg to avoid depending on newer poppler - -* Fri May 5 2006 Carl Worth - 1.1.6-1 -- Update to new upstream 1.1.6 - -* Wed May 3 2006 Carl Worth - 1.1.4-2 -- Revert upstream commit that introduced a dependency on a newer - poppler version for the PDF tests. - -* Wed May 3 2006 Carl Worth - 1.1.4-1 -- Update to new upstream 1.1.4 -- Drop both embedded-bitmaps and XRenderAddGlyphs patches as both now - have upstream versions - -* Fri Apr 28 2006 Carl Worth - 1.1.2-2 -- Add suggested patch for XRenderAddGlyphs crash of bug #4705 - https://bugs.freedesktop.org/show_bug.cgi?id=4705 - -* Tue Apr 25 2006 Carl Worth - 1.1.2-1 -- Update to new upstream 1.1.2 -- Port forward the embedded bitmaps patch (now committed upstream to - 1.1.3) -- Drop build-fix and chunk-glyphs patches which now come from upstream - -* Wed Mar 15 2006 Matthias Clasen - 1.0.4-1 -- Update to 1.0.4 -- Drop upstreamed patches - -* Fri Mar 3 2006 Carl Worth - 1.0.2-5 -- add patch to chunk Xlib glyph compositing (bug 182416 and - CVE-20060528) - -* Fri Feb 10 2006 Jesse Keating - 1.0.2-4.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 1.0.2-4.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Tue Jan 31 2006 Ray Strode 1.0.2-4 -- add patch from Tim Mayberry to support embbedded bitmap - fonts (bug 176910) - -* Tue Jan 3 2006 Jesse Keating 1.0.2-3.2 -- rebuilt again - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Mon Oct 31 2005 Matthias Clasen 1.0.2-3 -- Require libXrender-devel instead of xorg-X11-devel - -* Tue Oct 11 2005 Kristian Høgsberg 1.0.2-2 -- Rebuild against freetype-2.10 to pick up FT_GlyphSlot_Embolden. - -* Thu Oct 6 2005 Kristian Høgsberg - 1.0.2-1 -- Update to cairo-1.0.2. - -* Wed Aug 24 2005 Kristian Høgsberg - 1.0.0-1 -- Update to cairo-1.0.0. -- Drop cairo-0.9.2-cache-eviction-fix.patch and - cairo-0.9.2-dont-hash-null-string.patch. - -* Fri Aug 19 2005 Kristian Høgsberg 0.9.2-3 -- Add cairo-0.9.2-dont-hash-null-string.patch to avoid crash when - creating a cairo font from a FT_Face. - -* Tue Aug 16 2005 Kristian Høgsberg - 0.9.2-2 -- Rebuild against new freetype to get rid of --rpath in cairo.pc. - -* Mon Aug 15 2005 Kristian Høgsberg 0.9.2-1 -- Also obsolete libpixman-debuginfo. -- Add cairo-0.9.2-cache-eviction-fix.patch to fix ft font cache eviction. - -* Sun Aug 14 2005 Kristian Høgsberg 0.9.2-1 -- Update to cairo 0.9.2. Add Obsoletes: for libpixman <= 0.1.6. -- Drop cairo-0.6.0-font-options-to-scaled-font.patch. - -* Tue Aug 2 2005 Kristian Høgsberg - 0.6.0-2 -- Add cairo-0.6.0-font-options-to-scaled-font.patch to make sure font - cache eviction works correctly (#164664). - -* Thu Jul 28 2005 Owen Taylor 0.6.0-1 -- Update to cairo-0.6.0 - -* Mon Jul 18 2005 Kristian Høgsberg 0.5.2-1 -- Update to cairo-0.5.2 and drop bitmap font patch. - -* Wed Jul 6 2005 Kristian Høgsberg - 0.5.1-5 -- Fix typo in use of libpixman_version macro (Thanks to Michael - Schwendt, #162550). - -* Sun Jun 26 2005 Kristian Høgsberg - 0.5.1-4 -- Add more missing devel package requires (libpng-devel and - xorg-x11-devel) (#161688) -- Add Owens patch (cairo-0.5.1-bitmap-fonts.patch) to make bitmap - fonts work with cairo (#161653). - -* Wed Jun 22 2005 Kristian Høgsberg - 0.5.1-3 -- Add requirement on libpixman-devel for devel package. - -* Tue Jun 21 2005 Kristian Høgsberg - 0.5.1-2 -- Package gtk docs as part of devel package. -- Nuke static library. -- Update devel files so /usr/include/cairo is owned by devel package. - -* Mon Jun 20 2005 Kristian Høgsberg - 0.5.1-1 -- Update to cairo 0.5.1. -- Remove gtk-doc files, since --disable-gtk-doc doesn't work. -- Disable gtk-doc and add freetype and fontconfig BuildRequires. - -* Tue Jun 14 2005 Kristian Høgsberg - 0.5.0-2 -- Add libpixman-devel BuildRequires. -- Explicitly disable win32 backend. - -* Tue May 17 2005 Kristian Høgsberg - 0.5.0-1 -- Update to 0.5.0. - -* Sun Jan 23 2005 Kristian Høgsberg - 0.3.0-1 -- Update to 0.3.0, explicitly disable more backends. - -* Tue Nov 16 2004 Kristian Høgsberg - 0.2.0-1 -- Incorporate changes suggested by katzj: Require: ldconfig and run it - in %%post and %%postun, don't pass CFLAGS to make. - -* Mon Aug 9 2004 Kristian Høgsberg - 0.2.0-1 -- Update license, explicitly disable glitz. -- Create package. diff --git a/SPECS/UI-cairo/cairo-composite_color_glyphs.patch b/SPECS/UI-cairo/cairo-composite_color_glyphs.patch deleted file mode 100644 index fe8860e784..0000000000 --- a/SPECS/UI-cairo/cairo-composite_color_glyphs.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 79ad01724161502e8d9d2bd384ff1f0174e5df6e Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Thu, 30 May 2019 07:30:55 -0400 -Subject: [PATCH] Fix a thinko in composite_color_glyphs - -We can't just move around the contents of the -passed-in string, we need to make a copy. This -was showing up as memory corruption in pango. - -See https://gitlab.gnome.org/GNOME/pango/issues/346 ---- - src/cairo-surface.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/cairo-surface.c b/src/cairo-surface.c -index c30f84087..e112b660a 100644 ---- a/src/cairo-surface.c -+++ b/src/cairo-surface.c -@@ -2820,6 +2820,7 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface, - const cairo_clip_t *clip) - { - cairo_int_status_t status; -+ char *utf8_copy = NULL; - - TRACE ((stderr, "%s\n", __FUNCTION__)); - if (unlikely (surface->status)) -@@ -2847,6 +2848,10 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface, - status = CAIRO_INT_STATUS_UNSUPPORTED; - - if (_cairo_scaled_font_has_color_glyphs (scaled_font)) { -+ utf8_copy = malloc (sizeof (char) * utf8_len); -+ memcpy (utf8_copy, utf8, sizeof (char) * utf8_len); -+ utf8 = utf8_copy; -+ - status = composite_color_glyphs (surface, op, - source, - (char *)utf8, &utf8_len, -@@ -2861,6 +2866,8 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface, - if (num_glyphs == 0) - goto DONE; - } -+ else -+ utf8_copy = NULL; - - /* The logic here is duplicated in _cairo_analysis_surface show_glyphs and - * show_text_glyphs. Keep in synch. */ -@@ -2918,6 +2925,9 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface, - surface->serial++; - } - -+ if (utf8_copy) -+ free (utf8_copy); -+ - return _cairo_surface_set_error (surface, status); - } - diff --git a/SPECS/UI-cairo/cairo-multilib.patch b/SPECS/UI-cairo/cairo-multilib.patch deleted file mode 100644 index 16fd96bbef..0000000000 --- a/SPECS/UI-cairo/cairo-multilib.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up cairo-1.12.14/util/cairo-trace/cairo-trace.in.multilib cairo-1.12.14/util/cairo-trace/cairo-trace.in ---- cairo-1.12.14/util/cairo-trace/cairo-trace.in.multilib 2013-07-18 16:03:38.044832193 -0400 -+++ cairo-1.12.14/util/cairo-trace/cairo-trace.in 2013-07-18 16:03:43.981882777 -0400 -@@ -2,6 +2,12 @@ - - prefix=@prefix@ - exec_prefix=@exec_prefix@ -+case `uname -m` in -+ x86_64|s390x|ppc64) libdir=@prefix@/lib64 -+ ;; -+ *) libdir=@prefix@/lib -+ ;; -+esac - - nofile= - flush= -@@ -90,7 +96,7 @@ export CAIRO_TRACE_PROG_NAME - - if test "x$CAIRO_TRACE_SO" = "x"; then - CAIRO_TRACE_SO="" -- for lib in @libdir@/cairo/libcairo-trace.@SHLIB_EXT@ @libdir@/cairo/libcairo-trace.@SHLIB_EXT@* @libdir@/cairo/libcairo-trace.*.@SHLIB_EXT@ ; do -+ for lib in $libdir/cairo/libcairo-trace.@SHLIB_EXT@ $libdir/cairo/libcairo-trace.@SHLIB_EXT@* $libdir/cairo/libcairo-trace.*.@SHLIB_EXT@ ; do - if test -h "$lib" -o -f "$lib"; then - CAIRO_TRACE_SO="$lib" - break -@@ -98,7 +104,7 @@ if test "x$CAIRO_TRACE_SO" = "x"; then - done - fi - if test "x$CAIRO_TRACE_SO" = "x"; then -- echo "Could not find the cairo-trace shared library in @libdir@/cairo/." >&2 -+ echo "Could not find the cairo-trace shared library in $libdir/cairo/." >&2 - echo "Set the CAIRO_TRACE_SO environment variable to the full path of the library." >&2 - exit 15 - fi diff --git a/SPECS/cairo/cairo.spec b/SPECS/cairo/cairo.spec index 811f297363..de3e0e033c 100644 --- a/SPECS/cairo/cairo.spec +++ b/SPECS/cairo/cairo.spec @@ -1,20 +1,26 @@ Summary: A 2D graphics library. Name: cairo Version: 1.17.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2 OR MPLv1.1 Vendor: Microsoft Corporation Distribution: Mariner Group: System Environment/Libraries URL: https://cairographics.org Source0: https://cairographics.org/snapshots/%{name}-%{version}.tar.xz + BuildRequires: fontconfig-devel BuildRequires: freetype-devel +BuildRequires: gcc BuildRequires: glib-devel BuildRequires: libpng-devel +BuildRequires: libX11-devel BuildRequires: libxml2-devel +BuildRequires: libXrender-devel BuildRequires: pixman-devel BuildRequires: pkg-config +BuildRequires: pkgconfig(xext) + Requires: expat Requires: glib Requires: libpng @@ -23,9 +29,24 @@ Requires: pixman %description Cairo is a 2D graphics library with support for multiple output devices. +%package devel +Summary: Header and development files +License: (LGPLv2 OR MPLv1.1) AND MIT AND Public Domain + +Requires: %{name} = %{version}-%{release} +Requires: fontconfig-devel +Requires: freetype-devel +Requires: libpng-devel +Requires: pixman-devel + +%description devel +It contains the libraries and header files to create applications + %package gobject -Summary: GObject bindings for cairo -Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: GObject bindings for cairo +License: (LGPLv2 OR MPLv1.1) AND MIT AND Public Domain + +Requires: %{name}%{?_isa} = %{version}-%{release} %description gobject Cairo is a 2D graphics library designed to provide high-quality display @@ -35,9 +56,11 @@ This package contains functionality to make cairo graphics library integrate well with the GObject object system used by GNOME. %package gobject-devel -Summary: Development files for cairo-gobject -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-gobject%{?_isa} = %{version}-%{release} +Summary: Development files for cairo-gobject +License: (LGPLv2 OR MPLv1.1) AND MIT AND Public Domain + +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-gobject%{?_isa} = %{version}-%{release} %description gobject-devel Cairo is a 2D graphics library designed to provide high-quality display @@ -46,55 +69,53 @@ and print output. This package contains libraries, header files and developer documentation needed for developing software which uses the cairo Gobject library. -%package devel -Summary: Header and development files -Requires: %{name} = %{version}-%{release} -Requires: freetype-devel -Requires: pixman-devel -Requires: libpng-devel -Requires: fontconfig-devel +%package tools +Summary: Development tools for cairo -%description devel -It contains the libraries and header files to create applications +License: GPLv3 + +%description tools +Cairo is a 2D graphics library designed to provide high-quality display +and print output. + +This package contains tools for working with the cairo graphics library. + * cairo-trace: Record cairo library calls for later playback %prep %autosetup -p1 %build -./configure \ - --prefix=%{_prefix} \ - --enable-win32=no \ - --enable-tee \ - --enable-xlib=no \ - --enable-xlib-xrender=no \ - --enable-gobject \ - CFLAGS="-O3 -fPIC" \ +%configure \ + --disable-gl \ + --disable-gtk-doc \ --disable-static \ - --disable-symbol-lookup -make %{?_smp_mflags} + --disable-symbol-lookup \ + --enable-ft \ + --enable-gobject \ + --enable-pdf \ + --enable-ps \ + --enable-svg \ + --enable-tee \ + --enable-win32=no \ + --enable-xlib + +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%make_build %install -make DESTDIR=%{buildroot} install +%make_install find %{buildroot} -type f -name "*.la" -delete -print -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +rm -rf %{buildroot}%{_datadir}/gtk-doc + +%ldconfig_scriptlets %files %defattr(-,root,root) -%license COPYING -%{_bindir}/* -%{_libdir}/*.so.* -%{_libdir}/cairo/*.so* -%{_datadir}/* - -%files gobject -%{_libdir}/libcairo-gobject.so.* - -%files gobject-devel -%{_includedir}/cairo/cairo-gobject.h -%{_libdir}/libcairo-gobject.so -%{_libdir}/pkgconfig/cairo-gobject.pc +%license COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 +%{_libdir}/libcairo.so.* +%{_libdir}/libcairo-script-interpreter.so.* %files devel %defattr(-,root,root) @@ -103,7 +124,24 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%files gobject +%{_libdir}/libcairo-gobject.so.* + +%files gobject-devel +%{_includedir}/%{name}/cairo-gobject.h +%{_libdir}/libcairo-gobject.so +%{_libdir}/pkgconfig/cairo-gobject.pc + +%files tools +%license util/cairo-trace/COPYING util/cairo-trace/COPYING-GPL-3 +%{_bindir}/cairo-trace +%{_libdir}/%{name}/ + %changelog +* Wed Oct 06 2021 Pawel Winogrodzki - 1.17.4-3 +- Adding X components from "UI-cairo". +- Adding the "tools" subpackage. + * Thu Sep 16 2021 Pawel Winogrodzki - 1.17.4-2 - Disabling "symbol-lookup" feature due to compilation errors. diff --git a/cgmanifest.json b/cgmanifest.json index d89b361e64..6946ff6c6a 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -8968,16 +8968,6 @@ } } }, - { - "component": { - "type": "other", - "other": { - "name": "UI-cairo", - "version": "1.16.0", - "downloadUrl": "https://cairographics.org/releases/cairo-1.16.0.tar.xz" - } - } - }, { "component": { "type": "other",