--- xft-2.3.6.orig/.gitlab-ci.yml +++ xft-2.3.6/.gitlab-ci.yml @@ -0,0 +1,98 @@ +# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml: +# +# This CI uses the freedesktop.org ci-templates. +# Please see the ci-templates documentation for details: +# https://freedesktop.pages.freedesktop.org/ci-templates/ + +.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile + + +include: + # Arch container builder template + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/arch.yml' + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/ci-fairy.yml' + - template: Security/SAST.gitlab-ci.yml + + +stages: + - prep # prep work like rebuilding the container images if there is a change + - build # for actually building and testing things in a container + - test + - deploy + + +variables: + FDO_UPSTREAM_REPO: 'xorg/lib/libXft' + # The tag should be updated each time the list of packages is updated. + # Changing a tag forces the associated image to be rebuilt. + # Note: the tag has no meaning, we use a date format purely for readability + FDO_DISTRIBUTION_TAG: '2022-06-03.0' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xorg-util-macros xorgproto libx11 libxrender freetype2 fontconfig' + + +# +# Verify that commit messages are as expected +# +check-commits: + extends: + - .fdo.ci-fairy + stage: prep + script: + - ci-fairy check-commits --junit-xml=results.xml + except: + - master@xorg/lib/libXft + variables: + GIT_DEPTH: 100 + artifacts: + reports: + junit: results.xml + +# +# Verify that the merge request has the allow-collaboration checkbox ticked +# +check-merge-request: + extends: + - .fdo.ci-fairy + stage: deploy + script: + - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml + artifacts: + when: on_failure + reports: + junit: results.xml + allow_failure: true + + +# +# Build a container with the given tag and the packages pre-installed. +# This only happens if/when the tag changes, otherwise the existing image is +# re-used. +# +container-prep: + extends: + - .fdo.container-build@arch + stage: prep + variables: + GIT_STRATEGY: none + + +# +# The default build, runs on the image built above. +# +build: + stage: build + extends: + - .fdo.distribution-image@arch + script: + - autoreconf -ivf + - mkdir _builddir + - pushd _builddir > /dev/null + - ../configure --disable-silent-rules --enable-unit-tests + - make + - make check + - make distcheck + - popd > /dev/null --- xft-2.3.6.orig/ChangeLog +++ xft-2.3.6/ChangeLog @@ -1,678 +1,3 @@ -commit 7d3bcd3b9ae3ffbfcd4f31c8f1db2254df90bc33 -Author: Thomas E. Dickey -Date: Sat Sep 10 09:59:49 2022 -0400 - - libXft 2.3.6 - - Signed-off-by: Thomas E. Dickey - -commit 5e0ed11a43e37e50ba0937beaa40851c2d864981 -Author: Thomas E. Dickey -Date: Wed Sep 7 19:25:06 2022 -0400 - - fix gcc12 warning about malloc size - - Signed-off-by: Thomas E. Dickey - -commit ab2df0af3dc7c594d44ccccfa0e7ddeeefb1e70e -Author: Thomas E. Dickey -Date: Wed Sep 7 19:21:38 2022 -0400 - - revised fix for gcc 12 compiler warnings in xftextent.c - - Signed-off-by: Thomas E. Dickey - -commit 95284856783b824a714b7506762f4adce3bb17ce -Author: Adam Sampson -Date: Wed Sep 7 00:31:10 2022 +0100 - - Fix length check in XftTextExtents*. - - Commit 06a3c0ab6520e368ac936cb1ef172f19957db0fa added length checks of - the form "if (len <= 0) return;" to various Xft functions. However, - while rendering an empty string is equivalent to doing nothing, asking - for the extents of an empty string isn't -- it still needs to fill in - the extents structure. This broke text rendering in some applications - (e.g. xpdf's Motif GUI). - - Check for len < 0 in XftTextExtents* instead. - -commit c6309d4c8fcb5f4879cc25cf81b649f5eb665413 -Author: Thomas E. Dickey -Date: Mon Sep 5 15:23:18 2022 -0400 - - libXft 2.3.5 - - Signed-off-by: Thomas E. Dickey - -commit 4356b583f8c23575a9ac25d49e7d224930107ef5 -Author: Thomas E. Dickey -Date: Sat Jul 9 12:25:28 2022 -0400 - - update copyright notice - - Signed-off-by: Thomas E. Dickey - -commit 1f610967afc221b296036849d0c17aea495ab50c -Author: Thomas E. Dickey -Date: Sat Jul 9 12:23:57 2022 -0400 - - add a null-pointer check - - Signed-off-by: Thomas E. Dickey - -commit 16b87600d545b7c0e8f4b6629f553eb235f19f0c -Author: Thomas E. Dickey -Date: Sat Jul 9 09:58:58 2022 -0400 - - fix new gcc warnings - - Signed-off-by: Thomas E. Dickey - -commit a87be5ae94148f163a7b009df3d41a26a478d800 -Author: Thomas E. Dickey -Date: Sat Jul 9 09:28:29 2022 -0400 - - build-fix - - Signed-off-by: Thomas E. Dickey - -commit 3ca7a7c375a8c022c068e2534c5a6861e547eaef -Author: Thomas E. Dickey -Date: Sat Jul 9 09:04:18 2022 -0400 - - merge changes by Christian Werner - - see note in libXft merge-request #1 at #note_1222314 - - Signed-off-by: Thomas E. Dickey - -commit c53a1bc27c11e0c3cdf54e2beffd6cc220703a0b -Author: Thomas E. Dickey -Date: Mon May 30 20:11:14 2022 -0400 - - cleanup new compiler warnings - - Signed-off-by: Thomas E. Dickey - -commit 68c6a862409028d9b62ca601df02f345d60f969e -Author: Thomas E. Dickey -Date: Mon May 30 18:30:55 2022 -0400 - - build-fix for c89 - - Signed-off-by: Thomas E. Dickey - -commit 6a08279ee80dbd1a226592d7f18c862c2e4a7d3a -Author: Maxime Coste -Date: Tue Oct 22 22:46:49 2019 +1100 - - Add support for BGRA glyphs display and scaling - - Display is done using an XRender Picture, as XRender - glyphs are incompatible with BGRA rendering due to - their use of the glyph bitmap as a mask. - - Scaling is done by averaging all relevant pixel, which gives - much better result than nearest pixel sampling while staying - simple enough and not too computationally expensive. - - This enables color emoji rendering support. - - Fixes: #6 - - Signed-off-by: Maxime Coste - Signed-off-by: Thomas E. Dickey - -commit 2cbb9597e0b10d87fa9fc506910f69b9199320f0 -Author: Maxime Coste -Date: Thu Jan 28 20:05:13 2021 +1100 - - Introduce a _XftCompositeText helper function - - Dispatch to XRenderCompositeText{8,16,32} based off the given width. - - Signed-off-by: Maxime Coste - Signed-off-by: Thomas E. Dickey - -commit cac2fd528dd0ba9ed2308f6dda4598993c51cf64 -Author: Maxime Coste -Date: Thu Jan 28 19:59:10 2021 +1100 - - Introduce a _XftCompositeString helper function - - Dispatch to XRenderCompositeString{8,16,32} based off the given width. - - Signed-off-by: Maxime Coste - Signed-off-by: Thomas E. Dickey - -commit 10b53d1fa37615e81d1e3b6e4d2d2e25e4342c15 -Author: Thomas E. Dickey -Date: Tue Jul 5 20:13:42 2022 -0400 - - errata (cppcheck, clang --analyze, manpage credit) - - Signed-off-by: Thomas E. Dickey - -commit 6fc03611ed2b103b6b5a2f0c6b610087879325e4 -Author: Thomas E. Dickey -Date: Tue Jul 5 04:14:07 2022 -0400 - - document new features for glyph memory-tracking - - Signed-off-by: Thomas E. Dickey - -commit 36a8474813aba2be263f9de88ad9adfe85c0daf1 -Author: Thomas E. Dickey -Date: Mon Jul 4 20:08:58 2022 -0400 - - improve glyph management by relinking to unload least-recently used glyphs - - Signed-off-by: Thomas E. Dickey - -commit 01d44d70e9bd770ac365c88e09c5e432d2e517ad -Author: Thomas E. Dickey -Date: Mon Jul 4 18:31:24 2022 -0400 - - when tracking glyph memory usage, unload the oldest glyph rather than randomly - - Signed-off-by: Thomas E. Dickey - -commit 698e205b657f9192df07962e7823a2eae80e1c17 -Author: Thomas E. Dickey -Date: Mon Jul 4 18:10:32 2022 -0400 - - cppcheck/gcc-stricter warnings about printf-formats and operator precedence - - Signed-off-by: Thomas E. Dickey - -commit 949295d665b030eb451fa590940293ada84c9bfe -Author: Thomas E. Dickey -Date: Mon Jul 4 15:30:24 2022 -0400 - - fix delinkage of last glyph in font, improve debug-trace - - Signed-off-by: Thomas E. Dickey - -commit 058d7237068b2a698098c68c171bbbfd04a51b48 -Author: Thomas E. Dickey -Date: Mon Jul 4 07:56:46 2022 -0400 - - add asserts (to help with debugging), update copyright notices - - Signed-off-by: Thomas E. Dickey - -commit 318c6984baba0ea02147dc72a97e331234b6baf7 -Author: Thomas E. Dickey -Date: Mon Jul 4 07:41:12 2022 -0400 - - refactor _XftFontUncacheGlyph, separate the two types of loop for readability - - Signed-off-by: Thomas E. Dickey - -commit 33c1e1e3a5c08b690e145cc193d52fc13869af7b -Author: Thomas E. Dickey -Date: Sun Jul 3 20:53:23 2022 -0400 - - validate linked-list updates with _XftValidateGlyphUsage - - Signed-off-by: Thomas E. Dickey - -commit 114db90eac2c0f32f6b662d916a5af6a8990bf36 -Author: Thomas E. Dickey -Date: Fri Jul 1 04:25:10 2022 -0400 - - add option for tracking glyph memory-usage on a linked list - - Signed-off-by: Thomas E. Dickey - -commit 442bbb084a1316aa6b25b29e17889bc71c1e4235 -Author: Thomas E. Dickey -Date: Mon Jun 27 03:54:58 2022 -0400 - - add "trackmemusage" property to use in improved _XftFontUncacheGlyph - - The linear search used for randomly selecting a glyph to discard is - inefficient. This commit provides for a doubly-linked list which - could be maintained by the library to quickly discard the least - recently used glyph. - - Signed-off-by: Thomas E. Dickey - -commit d4a554c9795b109085ec31eedacba6532c18d802 -Author: Thomas E. Dickey -Date: Fri Jun 24 20:26:31 2022 -0400 - - reduce clutter with macros for allocating arrays - - Signed-off-by: Thomas E. Dickey - -commit 42c6616499e6ca193a0b764576a6ed8650dd3d7b -Author: Thomas E. Dickey -Date: Tue Jun 21 20:29:05 2022 -0400 - - add debugging trace for XftDefaultSet() - - Signed-off-by: Thomas E. Dickey - -commit 908a5e43bc37ea3b80985683369a27b4e607aecf -Author: Thomas E. Dickey -Date: Mon Jun 13 15:59:12 2022 -0400 - - add section of functions managing XftColor - - Signed-off-by: Thomas E. Dickey - -commit 5f809521ad2d1080710670602619582de8fd6b0c -Author: Thomas E. Dickey -Date: Sat Jun 11 10:55:40 2022 -0400 - - add a section on the XFT_DEBUG environment variable - - Signed-off-by: Thomas E. Dickey - -commit 5a1768ac1071bd05a731d9e744dbf8bb20ccf2b0 -Author: Thomas E. Dickey -Date: Sat Jun 11 10:24:26 2022 -0400 - - add a table of the "families" of functions - - Signed-off-by: Thomas E. Dickey - -commit 936bbafb612c5fb2ac838e94fb4e9a92da1d600c -Author: Thomas E. Dickey -Date: Sat Jun 11 09:50:28 2022 -0400 - - document XftGlyphFontSpecRender() and related functions. - - Signed-off-by: Thomas E. Dickey - -commit c76339229144ab6342315a27ee67a7ade1f43464 -Author: Thomas E. Dickey -Date: Fri Jun 10 10:08:10 2022 -0400 - - reduce clutter for external data-types by documenting them one time - - Signed-off-by: Thomas E. Dickey - -commit 58b1fed139c6dfd1a20a8b6090181f43aaffcc59 -Author: Thomas E. Dickey -Date: Fri Jun 10 09:27:36 2022 -0400 - - document the clipping-functions - - Signed-off-by: Thomas E. Dickey - -commit 73e1c4dc886079e87b0aaa6e3b6fa468b9ba2af2 -Author: Thomas E. Dickey -Date: Wed Jun 8 20:11:25 2022 -0400 - - add section on manipulating font data - - Signed-off-by: Thomas E. Dickey - -commit 5ac7ca85151515f5f03f5c0389f96f202e9cd6bb -Author: Thomas E. Dickey -Date: Wed Jun 8 04:27:48 2022 -0400 - - add section on manipulating font patterns - - Signed-off-by: Thomas E. Dickey - -commit 57892d1b735dcb5e019790b271df79d7a4b89e61 -Author: Thomas E. Dickey -Date: Wed Jun 8 04:01:50 2022 -0400 - - remove remaining internal prototypes for obsolete xftcompat.c - - Signed-off-by: Thomas E. Dickey - -commit 81944f3796dc1cc1a9529233cec3f3b2c2d546b3 -Author: Thomas E. Dickey -Date: Wed Jun 8 03:52:47 2022 -0400 - - move prototype for XftNameUnparse to Xft.h - - This entrypoint has "always" been exported, but not declared publicly. - It is used for debugging in xterm. - - Signed-off-by: Thomas E. Dickey - -commit 5b191b7db9e6a785ed566c82419b11540c240423 -Author: Thomas E. Dickey -Date: Tue Jun 7 18:45:55 2022 -0400 - - document XftFontOpenXlfd and XftXlfdParse - - Signed-off-by: Thomas E. Dickey - -commit b22b2b73ed1c9ed216b98ec33c3258030a34d0d2 -Author: Thomas E. Dickey -Date: Tue Jun 7 04:18:48 2022 -0400 - - add overview for text-extents section - - Signed-off-by: Thomas E. Dickey - -commit c3fc93be50d2f7e5c197afd47928d9338fca1618 -Author: Thomas E. Dickey -Date: Mon Jun 6 20:18:07 2022 -0400 - - change data-types to subsections to help with readability - - Signed-off-by: Thomas E. Dickey - -commit 04d5b339f42d90f51b9294552558fae181bc48d8 -Author: Thomas E. Dickey -Date: Mon Jun 6 04:14:55 2022 -0400 - - consistently bold "Xft" - - Signed-off-by: Thomas E. Dickey - -commit 18c74d39dd202e385d57415007ba6e803ac6f89a -Author: Thomas E. Dickey -Date: Sun Jun 5 20:28:07 2022 -0400 - - initial draft of initialization-functions documentation - - Signed-off-by: Thomas E. Dickey - -commit 48eb5a7cb0a7aaacfcb77eba035c5c47d082ab88 -Author: Thomas E. Dickey -Date: Sun Jun 5 12:25:38 2022 -0400 - - amend rule for creating manpage aliases - - eliminate too-specific gzip step, rely upon packaging system to do this. - - Signed-off-by: Thomas E. Dickey - -commit 765e2d2154946a6a9422c0470d6e57fbaf64182b -Author: Thomas E. Dickey -Date: Sat Jun 4 06:15:39 2022 -0400 - - cleanup manpage comments - - cleanup comments used as reminders to mention functions, - leaving comments used as reminders to add new paragraphs. - - Signed-off-by: Thomas E. Dickey - -commit 48d2353317db2b16b68633c88d5ecd4a583b234e -Author: Thomas E. Dickey -Date: Thu Jun 2 20:35:28 2022 -0400 - - install man-aliases for all of the exported symbols - - Signed-off-by: Thomas E. Dickey - -commit 724978961ff3b6e4f5043be07160487bc681fda1 -Author: Thomas E. Dickey -Date: Thu Jun 2 18:37:09 2022 -0400 - - corrected prototypes in manpage, matching Xft.h - - Signed-off-by: Thomas E. Dickey - -commit 4591cdd1c0f0c8afb8eac9cc908aa7c7d141dc6d -Author: Thomas E. Dickey -Date: Thu Jun 2 18:28:07 2022 -0400 - - reuse macros from Xcursor.man to fix ragged layout of typedefs and prototypes - - Signed-off-by: Thomas E. Dickey - -commit 06a3c0ab6520e368ac936cb1ef172f19957db0fa -Author: Thomas E. Dickey -Date: Mon May 30 15:15:11 2022 -0400 - - fix warnings by gcc 11; check if length <= zero - - Signed-off-by: Thomas E. Dickey - -commit 4342ea4b4b87790004f6883a0d5b36fdff7c0443 -Author: Thomas E. Dickey -Date: Mon May 30 10:39:39 2022 -0400 - - formatting fix, for clarity (no object change) - - Signed-off-by: Thomas E. Dickey - -commit b4ed18f1dc398ea39d9f76da556306fe02f26c97 -Author: Thomas E. Dickey -Date: Mon May 30 09:23:37 2022 -0400 - - quiet compiler warning with cast - - Signed-off-by: Thomas E. Dickey - -commit f2583758d3e5c65f372387d1c67433856682c3fb -Author: Thomas E. Dickey -Date: Mon May 30 09:21:28 2022 -0400 - - quiet compiler warning with cast - - Signed-off-by: Thomas E. Dickey - -commit c3ad9cf5b11772fbc9ff4dd793f0a7e897b5df5a -Author: Thomas E. Dickey -Date: Sun May 29 20:37:26 2022 -0400 - - change the internal memory-allocator to use size_t - - Signed-off-by: Thomas E. Dickey - -commit a9ce40d7f51dd20533d25e2a252afb1d09194d3f -Author: Thomas E. Dickey -Date: Sun May 29 19:44:16 2022 -0400 - - quiet warnings with casts - - Signed-off-by: Thomas E. Dickey - -commit 4edfca0cb839e51bca29f5c382c311c08db49b33 -Author: Thomas E. Dickey -Date: Sun May 29 18:26:13 2022 -0400 - - promote font->num_glyphs to FT_UInt or Glyph to fix warnings - - Signed-off-by: Thomas E. Dickey - -commit ef896b2106fa171707a4087be506259f578ff3a5 -Author: Thomas E. Dickey -Date: Sun May 29 18:05:10 2022 -0400 - - fix missing-initializer warning - - Signed-off-by: Thomas E. Dickey - -commit 768f43c04b5587d3b49ccd2d2f0133630c6a093b -Author: Thomas E. Dickey -Date: Sun May 29 17:51:07 2022 -0400 - - cleanup warnings about discarding const - - Signed-off-by: Thomas E. Dickey - -commit 4dadf0ed93624a09b4a2f7403b79103b50681391 -Author: Thomas E. Dickey -Date: Sun May 29 17:40:25 2022 -0400 - - quiet unused-parameter warnings with _X_UNUSED - - Signed-off-by: Thomas E. Dickey - -commit bafdc86cf32af60448db28ed03aa8230e7a14019 -Author: Alan Coopersmith -Date: Fri Jun 3 11:32:55 2022 -0700 - - gitlab CI: add a basic build test - - Signed-off-by: Alan Coopersmith - -commit 6cf073c11705cf576c3b7618a32ae121eaf14579 -Author: Alan Coopersmith -Date: Fri Jun 3 11:24:18 2022 -0700 - - Fix spelling/wording issues - - Found by using: - codespell --builtin clear,rare,usage,informal,code,names - - Signed-off-by: Alan Coopersmith - -commit 0dd423a89305e040ed20a8f449203ef091507790 -Author: Alan Coopersmith -Date: Fri Jun 3 11:22:22 2022 -0700 - - Build xz tarballs instead of bzip2 - - Signed-off-by: Alan Coopersmith - -commit 98b121f22c3477b508dd17aa5db99f2ebf36ade4 -Author: Alan Coopersmith -Date: Sun Aug 1 17:49:42 2021 -0700 - - libXft 2.3.4 - - Signed-off-by: Alan Coopersmith - -commit dcd637d0f162e177a73a121feeb9d9e4fd69d4bb -Author: Samanta Navarro -Date: Sat Oct 3 11:51:35 2020 +0000 - - Fix typo in manual - -commit 6e7da3c7c40deed551d14b6bab6f3d1ac256509f -Author: Keith Packard -Date: Fri Apr 3 17:53:33 2020 -0700 - - Remove call to FcNameRegisterObjectTypes - - This fontconfig function has been deprecated and no longer does - anything. - - Signed-off-by: Keith Packard - -commit 26a3a497409279d74827f374e65ae4b8d3c1f1f7 -Author: Keith Packard -Date: Fri Apr 3 17:43:04 2020 -0700 - - Skip 'render' pattern elements with invalid type - - Fontconfig no longer supports the FcNameRegisterObjectTypes API, which - means that any Xft custom fields cannot be specified in a fontconfig - name as those will always be set to FcTypeUnknown in the pattern. - - The only one of those we care about is XFT_RENDER, which was used to - disable the Render extension, something most apps probably don't need - to support in names anyways. Allow the call requesting this value to - return FcResultTypeMismatch and pretend that XFT_RENDER is missing - from the pattern. - - Signed-off-by: Keith Packard - -commit 972fa05c3df73fd3c99c409c0ac2225a58f76d09 -Author: Thomas E. Dickey -Date: Wed Apr 1 20:57:52 2020 -0400 - - build-fix for c89 - - Signed-off-by: Thomas E. Dickey - -commit 86c2355b116fd9febe2ac7f577e7c12e069d3986 -Author: Thomas E. Dickey -Date: Wed Apr 1 20:53:30 2020 -0400 - - minor typography fix - - Signed-off-by: Thomas E. Dickey - -commit ed8bb9667ac1e0f0863a03a44962be9654c4d04e -Author: Thomas E. Dickey -Date: Wed Apr 1 20:52:25 2020 -0400 - - fix most type-conversion warnings from gcc-normal, without object-file changes - - Signed-off-by: Thomas E. Dickey - -commit a266847d3c17dcdfcac719a1aa970ad54f4b545a -Author: Alan Coopersmith -Date: Sat Mar 16 11:03:38 2019 -0700 - - libXft 2.3.3 - - Signed-off-by: Alan Coopersmith - -commit fab5adf8fa3073862267e14aece1adf9eed0541c -Author: Alan Coopersmith -Date: Sat Mar 16 11:03:17 2019 -0700 - - Add description of libXft to README.md - - Signed-off-by: Alan Coopersmith - -commit b397ffb23f02389b6c6168e7826605789907d740 -Author: Alan Coopersmith -Date: Fri Dec 7 19:42:33 2018 -0800 - - Update configure.ac bug URL for gitlab migration - - Signed-off-by: Alan Coopersmith - -commit bdfb2b0e0fbf02ae69fe6cb2fbe352c4231e5c54 -Author: Alan Coopersmith -Date: Mon Nov 19 22:20:38 2018 -0800 - - Update README for gitlab migration - - Signed-off-by: Alan Coopersmith - -commit c418dc7594f98359ae10815f62ee3efc0a511cf8 -Author: Mihail Konev -Date: Thu Jan 26 13:52:49 2017 +1000 - - autogen: add default patch prefix - - Signed-off-by: Mihail Konev - -commit 6a12debafe35963d205e0dc78eb742ad898312b7 -Author: Emil Velikov -Date: Mon Mar 9 12:00:52 2015 +0000 - - autogen.sh: use quoted string variables - - Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent - fall-outs, when they contain space. - - Signed-off-by: Emil Velikov - Reviewed-by: Peter Hutterer - Signed-off-by: Peter Hutterer - -commit 0d3402d1138afe9854452eb494acc649faa0dc9e -Author: Peter Hutterer -Date: Tue Jan 24 10:32:07 2017 +1000 - - autogen.sh: use exec instead of waiting for configure to finish - - Syncs the invocation of configure with the one from the server. - - Signed-off-by: Peter Hutterer - Reviewed-by: Emil Velikov - -commit e8a83226bc10afb587f6f34daac44d2ef809c85e -Author: Keith Packard -Date: Sun Oct 19 18:00:26 2014 -0500 - - XftDrawSrcPicture: Use XRenderCreateSolidFill when available - - Instead of creating 1x1 pictures, use the solid pictures added in - Render version 0.10 - - Signed-off-by: Keith Packard - Reviewed-by: Adam Jackson - commit 214f9b5306d833e2787c75fe41dfdc9228fcb738 Author: Alan Coopersmith Date: Thu Jun 5 23:04:54 2014 -0700 --- xft-2.3.6.orig/autogen.sh +++ xft-2.3.6/autogen.sh @@ -0,0 +1,17 @@ +#! /bin/sh + +srcdir=`dirname "$0"` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd "$srcdir" + +autoreconf -v --install || exit 1 +cd "$ORIGDIR" || exit $? + +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH libXft" + +if test -z "$NOCONFIGURE"; then + exec "$srcdir"/configure "$@" +fi --- xft-2.3.6.orig/debian/changelog +++ xft-2.3.6/debian/changelog @@ -0,0 +1,709 @@ +xft (2.3.6-1) unstable; urgency=medium + + * New upstream release. (Closes: #975597, #1021120) + + -- Timo Aaltonen Mon, 03 Oct 2022 10:15:21 +0300 + +xft (2.3.4-1) unstable; urgency=medium + + * New upstream release. + * watch: Update git url. + * control, rules: Migrate to debhelper-compat, bump to 13. + * control: Bump policy to 4.6.0. + + -- Timo Aaltonen Fri, 01 Apr 2022 09:49:24 +0300 + +xft (2.3.2-2) unstable; urgency=medium + + [ Julien Cristau ] + * Use https URL in debian/watch. + * Update packaging VCS URL for move to salsa. + + [ Cyril Brulebois ] + * Remove myself from Uploaders (Closes: #889301). + + [ Emilio Pozuelo Monfort ] + * Mark libxft-dev Multi-Arch: same. Thanks Hugh McMaster for the + patch. (Closes: #884176). + * Specify source format. + * Switch to automatic -dbgsym packages. + * debian/README.source: dropped, we no longer use xsfbs. + * Bump the debhelper compat to 11. + - parallel builds and autoreconf enabled by default. + - --disable-silent-rules automatically passed by debhelper. + * Switch to dh_missing and enable fail-missing. + + -- Emilio Pozuelo Monfort Tue, 17 Apr 2018 18:41:29 +0200 + +xft (2.3.2-1) unstable; urgency=medium + + * New upstream release. + * Rewrite debian/rules using dh, bump compat level to 9, drop xsfbs. + + -- Julien Cristau Sun, 13 Jul 2014 10:49:43 +0200 + +xft (2.3.1-2) unstable; urgency=medium + + * Fix FTBFS with freetype 2.5.1 (closes: #733385). + + -- Julien Cristau Sat, 18 Jan 2014 20:14:05 +0100 + +xft (2.3.1-1) unstable; urgency=low + + * New upstream release: + - Subpixel LCD text rendering improvements (Closes: #641197). + + -- Cyril Brulebois Sat, 16 Jun 2012 22:04:44 +0200 + +xft (2.2.0-3) unstable; urgency=low + + * Team upload. + + [ Steve Langasek ] + * Build for multiarch. + + [ Julien Cristau ] + * Add build-indep and build-arch d/rules targets. + * Bump Standards-Version to 3.9.2. + + -- Julien Cristau Sun, 12 Jun 2011 16:30:44 +0200 + +xft (2.2.0-2) unstable; urgency=low + + * Remove Andres Salomon and David Nusinow from Uploaders. Thanks for your + work! + * Parse DEB_BUILD_OPTIONS with $(filter ..), not $(findstring ..). + * Drop obsolete Conflicts on libxft2-dev and xlibs-dev. + * Bump Standards-Version to 3.9.1. + * Upload to unstable. + + -- Julien Cristau Thu, 10 Feb 2011 20:04:14 +0100 + +xft (2.2.0-1) experimental; urgency=low + + * New upstream release: + - Remove obsolete xft-config script. + * Adapt libxft-dev.install accordingly. + * Remove RCS tag in debian/copyright. + * Bump xutils-dev build-dep for new macros. + * Drop 001_no_export_freetype.diff, merged upstream. + + -- Cyril Brulebois Fri, 14 Jan 2011 05:09:29 +0100 + +xft (2.1.14-2) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + + [ Cyril Brulebois ] + * Add udeb needed for the graphical installer: libxft2-udeb. + * Version/Bump some B-D to make sure the udeb gets its dependencies on + the (recently-added) udebs rather than on the libraries: + - libx11-dev + - libxrender-dev + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). + * Add ${misc:Depends} to non-udeb binaries, and wrap Depends. + * Add myself to Uploaders. + + -- Cyril Brulebois Thu, 11 Mar 2010 02:33:50 +0100 + +xft (2.1.14-1) unstable; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + * Bump the build-dep on xutils-dev (>= 1:7.5~1). + * Bump Standards-Version to 3.8.3 (README.source added). + * Drop pre-dependency on x11-common from libxft-dev. This was needed + for upgrades from sarge. + * Move -dbg package to section debug. + + -- Julien Cristau Thu, 03 Dec 2009 14:40:25 +0100 + +xft (2.1.13-3) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Sun, 15 Feb 2009 22:07:06 +0100 + +xft (2.1.13-2) experimental; urgency=low + + * Delete obsolete libxft-dev preinst (closes: #491633). + + -- Julien Cristau Sat, 26 Jul 2008 23:02:21 +0200 + +xft (2.1.13-1) experimental; urgency=low + + [ Brice Goglin ] + * Update upstream URL in debian/copyright. + + [ Julien Cristau ] + * New upstream release. + * Stop handling nostrip explicitly in debian/rules (dh_strip does it + already), and allow parallel builds using sample code from policy. + * Switch to running autoreconf at build time; build-depend on automake, + libtool and xutils-dev. + + -- Julien Cristau Sat, 19 Jul 2008 16:30:18 +0200 + +xft (2.1.12-3) unstable; urgency=low + + * Remove Branden from Uploaders with his permission. + * Bump Standards-Version to 3.7.3. + * Add Vcs-Git and Vcs-Browser control fields. + * Drop pre-dependency on x11-common from libxft2 and libxft2-dbg, as it's + not needed. + * Use ${binary:Version} instead of the equivalent but confusingly-named + ${Source-Version}. + * Modify patch 001_no_export_freetype.diff to not export fontconfig in + 'pkg-config --libs xft' (closes: #389831). + * Add myself to Uploaders. + * Fix XftDrawRect when Render not supported (cherry-picked from upstream + git; closes: #462262). + + -- Julien Cristau Tue, 10 Jun 2008 16:12:37 +0200 + +xft (2.1.12-2) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Tue, 10 Apr 2007 20:43:57 +0200 + +xft (2.1.12-1) experimental; urgency=low + + * New upstream release. + * Install the upstream ChangeLog. + + -- Julien Cristau Fri, 9 Feb 2007 14:56:32 +0100 + +xft (2.1.10-3) experimental; urgency=low + + * Remove that explicit shlibs file added in the last upload. The only + symbols that are hidden are private, so if your app is using those symbols + it's being very naughty. Go back to just generating shlibs using + dh_makeshlibs. + + -- David Nusinow Thu, 24 Aug 2006 00:29:33 +0000 + +xft (2.1.10-2) experimental; urgency=low + + * Add shlibs file because the public API and exported symbols changed + between 2.1.8.2 and now + + -- David Nusinow Wed, 16 Aug 2006 20:34:41 +0000 + +xft (2.1.10-1) experimental; urgency=low + + * New upstream release. + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Fix changelog to not make lintian upset. + * Drop patches/002_no_xproto_dep.diff, now that x11proto-core-dev has + a .pc file. Make the dep on libx11-dev versioned so that we're sure + to have an xproto.pc file (from xorg 7.0 or higher). + + -- Andres Salomon Sun, 23 Jul 2006 03:17:32 -0400 + +xft (2.1.8.2-8) unstable; urgency=low + + * Bump standards version to 3.7.2.0 + * Bump debhelper compat level to 5 + * Rebuild with freetype6 2.2.1, which fixes ABI breakages of the past. + Thanks Steve Langasek and Keith Packard for managing the freetype side of + things. (closes: #350113) + + -- David Nusinow Sun, 21 May 2006 16:18:09 -0400 + +xft (2.1.8.2-7) unstable; urgency=low + + * Reorder makeshlib command in rules file so that ldconfig is run + properly. Thanks Drew Parsons and Steve Langasek. (closes: #363922) + * Run dh_install with --list-missing + * Fix package name in rules file so that the debugging symbols go to the + right place. Thanks Tim Johann. (closes: #365341) + * Remove useless instaces of x-dev in dependencies. Thaks Ross Burton. + (closes: #363507) + + -- David Nusinow Tue, 2 May 2006 22:31:46 -0400 + +xft (2.1.8.2-6) unstable; urgency=low + + * Upload to unstable + * Move the header files back to /usr/include/X11/Xft to bring them in line + with X11R7 + * Add versioned pre-depends on x11-common to match X11R7. Do this for all + packages shipped by this source package. + + -- David Nusinow Thu, 23 Mar 2006 22:44:40 -0500 + +xft (2.1.8.2-5) unstable; urgency=low + + * Actually install the header files to /usr/X11R6/include/Xft. Thanks Steve + Langasek. + + -- David Nusinow Wed, 22 Mar 2006 00:33:46 -0500 + +xft (2.1.8.2-4) unstable; urgency=low + + * Make libxft-dev pre-depend on x11-common so as to make sure that the + symlink for /usr/include/X11 is already in place when we install the + package. (closes: #358254, #358260, #350298, #358308) + + -- David Nusinow Wed, 22 Mar 2006 00:06:39 -0500 + + +xft (2.1.8.2-3) unstable; urgency=low + + * Include freetype headers in cflags in the xft.pc file. This is an edit to + 001_no_export_freetype.diff. The freetype headers are included in xft's + headers, so these are necessary. Also, don't use variables in the .pc file + that haven't been defined anywhere. Thanks to Roger Leigh, Decklin Foster, + Eric Dorland, and Steve Langasek (who wrote the patch). (closes: #350458) + + -- David Nusinow Sun, 5 Feb 2006 12:59:29 -0500 + +xft (2.1.8.2-2) unstable; urgency=low + + * Add 002_no_xproto_dep.diff so that the .pc file doesn't depend on xproto, + which doesn't yet have a .pc file in Debian (to be removed when 7.0 enters + the archive). Thanks Mike Hommey. (closes: #349678) + * Include patch from Steve Langasek in full from previous upload. This + should work around the issue properly. (closes: #349318) + + -- David Nusinow Tue, 24 Jan 2006 21:52:01 -0500 + +xft (2.1.8.2-1) unstable; urgency=low + + * Add build-dep on quilt + * Add 001_no_export_freetype.diff. This is a modified patch from Steve + Langasek that causes xft.pc not to export freetype or xrender as part of + the interface, but hide them in Requires.private instead (closes: #349318) + * Remove versioned build-deps on libx11 and libxrender. + * Move preinst to preinst.in so it doesn't get deleted by clean target. We + really need a better way to deal with these things... + + -- David Nusinow Sun, 22 Jan 2006 22:35:36 -0500 + +libxft (2.1.8.2-0ubuntu2) dapper; urgency=low + + * Change dependency on x-common to x11-common. + + -- Daniel Stone Thu, 19 Jan 2006 18:27:58 +1100 + +libxft (2.1.8.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Repackaged to fit all the other X packages. + * Stop shipping libXft.la. + + -- Daniel Stone Wed, 21 Dec 2005 13:13:31 +1100 + +xft (2.1.8.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 12 Dec 2005 15:33:13 +1100 + +xft (2.1.7-1ubuntu2) breezy; urgency=low + + * Add Pre-Depends on x-common to libxft-dev, so its files don't get caught + in /usr/X11R6 thanks to symlink treachery. + + -- Daniel Stone Thu, 19 May 2005 00:48:57 +1000 + +xft (2.1.7-1ubuntu1) breezy; urgency=low + + * Move files from /usr/X11R6 to /usr. + + -- Fabio M. Di Nitto Tue, 17 May 2005 18:44:50 +0200 + +xft (2.1.7-1) unstable; urgency=low + + * New upstream release. + + Keith Packard attests, and Branden Robinson verified as far as he is + able, that no interface changes have been made since 2.1.2. + + Highlights of upstream changes: + - Change FC_CHARCELL and FC_MONO interpretation. FC_MONO no longer + clips glyphs to charcell, you must specify FC_CHARCELL for that. + - Add support for FT_GlyphSlot_Embolden where it exists (which it + usually doesn't). + - Avoid crashing when using FT_Face objects. + - Deal with broken FreeType 2.1.7 BDF/PCF loaders by trying both + y_ppem/x_ppem and width/height values. + - Work with older versions of Fontconfig by using various pattern + elements only when defined. + - Change Freetype includes to new syntax. + - Search for nearest bitmap for bitmap-only fonts. + - Support fontconfig 2.2 release which doesn't include FC_HINT_STYLE. + + * Update Debian copyright file with URL to new tar archive, and identify + Keith Packard as the upstream maintainer, not the upstream author + (upstream now provides an AUTHORS file to clarify the latter). + + * Correct and enhance xft-config's usage message: + + No non-option arguments are allowed. + + At least one option argument must be specified. + + Use ellipsis notation to indicate that more than one option is allowed. + + Provide one-sentence summary of the command's purpose. + + Sort option names in lexicographic order. + + * Write and ship manual page for xft-config. + + * Drop libxft2.docs debhelper file; CDBS is now brainy enough to identify + and tell dh_installdocs to ship a non-empty README file, so libxft2.docs + has become redundant. + + * Add debian/compat file to declare debhelper version 4 compatibility. + + -- Branden Robinson Fri, 1 Apr 2005 13:13:48 -0500 + +xft (2.1.2-6) unstable; urgency=low + + * Make package compatible with the XFree86 4.3.0 package reorganization. + - debian/control: + + package build-depends on x-dev and libx11-dev instead of xlibs-dev + + libxrender-dev depends on x-dev and libx11-dev instead of xlibs-dev + + make libxft-dev conflict with xlibs-dev (<< 4.3.0) due to (now + undiverted) file overlaps + - debian/libxft-dev.preinst: remove diversions made by previous versions + of package if present + - debian/libxft-dev.postrm: deleted + + -- Branden Robinson Thu, 11 Mar 2004 02:13:15 -0500 + +xft (2.1.2-5) unstable; urgency=medium + + * Urgency due to fix for FTBFS problem introduced by new FreeType library. + + * Clean up package's build-dependencies and dependencies. + - debian/control: + + Drop versioning of build-dependencies on libxrender-dev and xlibs-dev. + All officially released versions of these Debian packages are + sufficient to build this package. + + Drop package dependencies on debhelper's "${misc:Depends}" construct; + this package is too simple to need it. + + Drop versioning of libxft-dev's dependencies on libxrender-dev and + xlibs-dev. All officially released versions of these Debian packages + should be sufficient to objects using this package. + + Drop libxft-dev's dependency on pkg-config; pkg-config is supported + but not mandated. + + * Document more functions in the Xft(3) manual page. + - Xft.3.in + + * Set package maintainer to the Debian X Strike Force and put myself in the + Uploaders field. + - debian/control + + * Do not include directly; use the macro FT_FREETYPE_H + to include it instead, as required by freetype 2.1.7 (fixes FTBFS when + FreeType 2.1.7 is on the system; thanks, Tore Anderson). + (Closes: #221129) + - Xft.h + + * Stop passing --x-includes and --x-libraries flags to + DEB_CONFIGURE_EXTRA_FLAGS; AC_PATH_X suffices to locate the X include + files and libraries. + - debian/rules + + * Pass --disable-rpath flag to DEB_CONFIGURE_EXTRA_FLAGS; consequently, drop + invocation of chrpath from common-install-arch target. + - debian/rules + - debian/control: drop build-dependency on chrpath + + * In the pre-installation script, only remove diversions from old + libxft2-dev package if that package has those diversions; dpkg-divert will + barf if you try to remove a nonexistent diversion when a different package + is diverting the same file. This enables libxft-dev to be upgraded from + the previous version, and installed over the same version. + - debian/libxft-dev.preinst + + -- Branden Robinson Mon, 17 Nov 2003 03:07:41 -0500 + +xft (2.1.2-4) unstable; urgency=low + + * Set AM_MAINTAINER_MODE because we do not want users of the Debian source + package to have to have automake installed. + - configure.ac + + * Run aclocal && automake --foreign && autoconf to resynchronize with + changes to Makefile.am and configure.ac. + - Makefile.in + - aclocal.m4 + - configure + + * Make libxft-dev conflict with and provide libxft2-dev to help apt figure + out an upgrade path. Deliberately *not* making libxft-dev replace + libxft2-dev, even though it would be correct to do so, because doing that + plays such havoc with dpkg-divert that libxft-dev will fail to install on + upgrades from libxft2-dev. This way libxft2-dev will be properly removed + first. + - debian/control + + -- Branden Robinson Wed, 8 Oct 2003 18:09:37 -0500 + +xft (2.1.2-3) unstable; urgency=low + + * Migrate dpkg diversions from libxft2-dev to libxft-dev, which was + neglected in the previous release. + - debian/libxft-dev.preinst: + + remove all previous diversions created by libxft2-dev on all installs + and upgrades (libxft-dev's preinst script will not be passed a $2 + corresponding to the most-recently-configured version of libxft2-dev) + + add diversions using new package name + - debian/libxft-dev.postrm: remove diversions using new package name + + -- Branden Robinson Tue, 7 Oct 2003 15:02:06 -0500 + +xft (2.1.2-2) unstable; urgency=low + + * Take a hatchet to the RPATH that libtool insists on putting into the + libXft shared object by using chrpath. + - debian/control: add build-dependency on chrpath + - debian/rules: add common-install-arch double-colon rule to invoke + chrpath on the libXft shared object + + -- Branden Robinson Tue, 7 Oct 2003 00:00:13 -0500 + +xft (2.1.2-1) unstable; urgency=low + + * new upstream version + - debian/copyright: + + updated URL of upstream release + + resync copyright and license notice with upstream + + * Rename source package to "xft" from "xft2". + - debian/control + + * Rename libxft2-dev package to libxft-dev. Consequently, drop conflict and + provide relationship with (formerly virtual) libxft-dev package. + - debian/control + - debian/libxft-dev.install: renamed from libxft2-dev.install + - debian/libxft-dev.postrm: renamed from libxft2-dev.postrm + - debian/libxft-dev.preinst: renamed from libxft2-dev.preinst + + * Add versioning (>> 4.2.1) to libxft-dev's dependency on xlibs-dev. + - debian/control + + * Ship upstream README in libxft2's documentation directory. + - debian/libxft2.docs + + * Correct libxft2-dbg's extended description to mention the correct path + where the debugging library is installed. + - debian/control + + * Migrate from CBS to CDBS. + - debian/control: add build-dependency on cdbs (>= 0.4.12) (thanks to + Colin Walters for adding debugging package support I can use with a + clear conscience :) ) + - debian/rules: renamed from debian/rocks and translated to CDBS-speak + + -- Branden Robinson Mon, 6 Oct 2003 20:55:54 -0500 + +xft2 (2.1.1-3) unstable; urgency=low + + * configure: re-run autoconf to expose the fix to configure.ac from 2.1.1-1 + (thanks, Robert Millan) (Closes: #185536) + + * debian/control: + - tweak packages' short descriptions + - make libxft2 depend on ${misc:Depends} so debhelper can do its thing + - add libxft2-dbg binary package + * debian/rocks: + - new rule, deb-makeshlibs-libxft2-dbg, which is a no-op to prevent CBS + from running dh_makeshlibs on this package + - new rule, deb-strip-libxft2-dbg, which is a no-op to prevent CBS from + running dh_strip on this package + * debian/libxft2-dbg.install: ship the shared object(s) in + /usr/X11R6/lib/debug/ + + * Version the build dependency on xlibs-dev to specify version 4.2.1 or + later; xft2 will not build successfully with woody-era (4.1.0) versions of + xlibs-dev. + - debian/control + + * Bump Standards-Version to 3.6.1; no changes necessary. + - debian/control + + * Source package build-depends, and libxft2-dev depends, on libxrender-dev + (>> 0.8.1). + - debian/control + + * Drop README.Debian file; xft will be separately packaged from XFree86 for + the forseeable future. + - debian/README.Debian: deleted + + * Ship libXft.la file in libxft2-dev. + - debian/libxft2-dev.install + + * Ship library files in /usr/lib instead of /usr/X11R6/lib, and debugging + library files in /usr/lib/debug instead of /usr/X11R6/lib/debug, per + policy 11.8.7. Continuing to ship include files in /usr/X11R6/include/X11 + until upstream default changes. + - debian/libxft2{,-dbg,-dev}.install + + * Ship Xft.3 manpage (in /usr/share/man/man3, so it does not conflict with + the XFree86-provided Xft manpage, which is being renamed to Xft1.3x in + 4.3.0 anyway). + - debian/libxft2-dev.install + + -- Branden Robinson Sat, 4 Oct 2003 19:31:11 -0500 + +xft2 (2.1.1-2) unstable; urgency=low + + * debian/control: move libxft2-dev from section "devel" to "libdevel" + * debian/rocks: + - drop deb-common-build and deb-extra-clean rules per Colin Walters + - pass --x-includes and --x-libraries to configure script, since the + AC_PATH_X autoconf macro is highly suboptimal + - don't be so crazy about the versioning in the shlibs file (i.e., drop + Debian package component) + * debian/libxft2-dev.preinst: sense of the version comparison when removing + the obsolete diversion of XftFreetype.h was wrong; fixed + + -- Branden Robinson Wed, 30 Apr 2003 23:24:33 -0500 + +xft2 (2.1.1-1) unstable; urgency=low + + * New upstream version. + + includes fixes for some bugs when drawing to non-RENDER-enabled servers + (Closes: #178817) + + handle both 0-indexed and 1-indexed glyph numbering schemes + (Closes: #190610) + + xft-config --cflags and --libs now give more correct output + (Closes: #179942, #179944) + + * configure.ac: add -lXext and -lX11 to XRENDER_LIBS + * xft-config.in: add -lX11 to --libs output + * xft.pc.in: add -lX11 to Libs line + + * the above changes ensure that libXft.so.2.1.1 has proper linkage, declares + needed shared objects correctly, and thus enables dpkg-shlibdeps to find + what it's looking for (Closes: #186042) + + * debian/*: various cosmetic cleanups + * debian/control: + - Update Build-Depends and libxft-dev's Depends to reflect all development + library dependencies + - Bump Standards-Version to 3.5.9. + - Rewrite extended descriptions. + * debian/copyright: updated + * debian/rocks: stop nuking config.{guess,sub} in debian-extra-clean rule; + it is no longer part of the upstream source archive + * debian/libxft2-dev.{postrm,preinst}: stop diverting XftFreetype.h, since + the package no longer ships it; also handle removal of now-obsolete + diversion when upgrading from earlier versions + + -- Branden Robinson Wed, 30 Apr 2003 01:31:58 -0500 + +xft2 (2.1-8) unstable; urgency=low + + * Adopting this package per request from Colin Walters (XFree86 4.3.0 will + be generating libxft2, anyway.) + * config/{config.guess,config.sub,ltmain.sh}: updated with libtoolize + --force --copy + * debian/control: set Maintainer field to me + + -- Branden Robinson Tue, 11 Mar 2003 23:28:33 -0500 + +xft2 (2.1-7) unstable; urgency=low + + * debian/control: + - Build-Depend on xlibs-dev (>= 4.2.0) (Closes: #174596). + - [libxft2-dev] Depend on xlibs-dev (>= 4.2.0). + + -- Colin Walters Fri, 17 Jan 2003 13:11:34 -0500 + +xft2 (2.1-6) unstable; urgency=low + + * debian/rules: + - Update to latest version of Colin's Build System. + * debian/rocks: + - Tighten up shlibs for libxft2. + + -- Colin Walters Wed, 8 Jan 2003 22:47:30 -0500 + +xft2 (2.1-5) unstable; urgency=low + + * debian/control: + - Build-Depend on the latest libfontconfig1-dev, and by transitivity + the latest libfreetype6-dev. The libfreetype6-dev issue was causing + configuration problems, which is what caused the autoconf macros to + pick up empty paths for X. (Closes: #172661). + + -- Colin Walters Sun, 22 Dec 2002 17:42:30 -0500 + +xft2 (2.1-4) unstable; urgency=low + + * debian/patches/fix-configure-in-x-paths.patch: + - New patch (Closes: #172703, #172661). + * debian/rocks: + - Remove extra cruft in deb-extra-clean rule. + + -- Colin Walters Thu, 12 Dec 2002 17:42:57 -0500 + +xft2 (2.1-3) unstable; urgency=low + + * debian/control: + - Depend (and Build-Depend) on the latest libfontconfig1-dev. + * debian/rules: + - Update to latest version of Colin's Build System. + + -- Colin Walters Wed, 11 Dec 2002 00:42:03 -0500 + +xft2 (2.1-2) unstable; urgency=low + + * First upload to unstable; this is part of #170559, which is closed + with the fontconfig upload. + * debian/rules: + - Update to latest version of Colin's Build System. + + -- Colin Walters Fri, 6 Dec 2002 01:39:21 -0500 + +xft2 (2.1-1) unstable; urgency=low + + * New upstream version. + * debian/rules: + - Use Colin's Build System. + * debian/control: + - Bump Standards-Version to 3.5.8. + - Build-Depend on the latest fontconfig. + * debian/libxft2-dev.{preinst,postrm}: + - Add Debhelper tokens. + * debian/copyright: + - Fix Upstream Authors. + + -- Colin Walters Tue, 3 Dec 2002 23:04:12 -0500 + +xft2 (2.0-4) unstable; urgency=low + + * debian/libxft2.install: + - Install xft-config. + + -- Colin Walters Sat, 19 Oct 2002 10:24:35 -0400 + +xft2 (2.0-3) unstable; urgency=low + + * debian/libxft2.install: + - Install libraries in /usr/X11R6/lib, not /usr/lib. + + -- Colin Walters Tue, 15 Oct 2002 11:22:58 -0400 + +xft2 (2.0-2) unstable; urgency=low + + * debian/control: + - [xft2] Build-Depend on xlibs-dev, not xlib6g-dev. + - [libxft2-dev] Depend on xlibs-dev, not xlib6g-dev. Also depend on pkg-config. + * debian/rules: + - Install xft.pc. + + -- Colin Walters Mon, 14 Oct 2002 22:59:06 -0400 + +xft2 (2.0-1) unstable; urgency=low + + * Initial version. + + -- Colin Walters Sun, 13 Oct 2002 14:43:56 -0400 + +vim:set ai tw=78 et sw=2 sts=2: --- xft-2.3.6.orig/debian/control +++ xft-2.3.6/debian/control @@ -0,0 +1,61 @@ +Source: xft +Section: devel +Priority: optional +Maintainer: Debian X Strike Force +Build-Depends: + debhelper-compat (= 13), + libfontconfig1-dev, + libfreetype6-dev, + libx11-dev (>= 2:1.3.3-2), + libxrender-dev (>= 1:0.9.5-2), + zlib1g-dev | libz-dev, + quilt, + xutils-dev (>= 1:7.5+4), +Standards-Version: 4.6.0 +Vcs-Git: https://salsa.debian.org/xorg-team/lib/xft +Vcs-Browser: https://salsa.debian.org/xorg-team/lib/xft + +Package: libxft2 +Section: libs +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Description: FreeType-based font drawing library for X + Xft provides a client-side font API for X applications, making the FreeType + font rasterizer available to X clients. Fontconfig is used for font + specification resolution. Where available, the RENDER extension handles + glyph drawing; otherwise, the core X protocol is used. + +Package: libxft2-udeb +XC-Package-Type: udeb +Section: debian-installer +Architecture: any +Depends: + ${shlibs:Depends}, +Description: FreeType-based font drawing library for X + This is a udeb, or a microdeb, for the debian-installer. + +Package: libxft-dev +Section: libdevel +Architecture: any +Depends: + libxft2 (= ${binary:Version}), + libc6-dev | libc-dev, + libfontconfig1-dev, + libfreetype6-dev, + libx11-dev (>= 2:1.0.0), + libxrender-dev, + zlib1g-dev | libz-dev, + ${misc:Depends}, +Provides: libxft2-dev +Multi-Arch: same +Description: FreeType-based font drawing library for X (development files) + Xft provides a client-side font API for X applications, making the FreeType + font rasterizer available to X clients. Fontconfig is used for font + specification resolution. Where available, the RENDER extension handles + glyph drawing; otherwise, the core X protocol is used. + . + This package provides a static library and C header files. --- xft-2.3.6.orig/debian/copyright +++ xft-2.3.6/debian/copyright @@ -0,0 +1,31 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/lib/ + +This package was originally Debianized by Colin Walters + on Sun, 13 Oct 2002 15:01:50 -0400. + +Later versions were Debianized by Branden Robinson . + +Upstream maintainer: Keith Packard + +Copyright and license: + +Copyright © 2001,2003 Keith Packard + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Keith Packard not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Keith Packard makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. --- xft-2.3.6.orig/debian/libxft-dev.install +++ xft-2.3.6/debian/libxft-dev.install @@ -0,0 +1,5 @@ +usr/include/X11/Xft/* +usr/lib/*/libXft.a +usr/lib/*/libXft.so +usr/lib/*/pkgconfig/*.pc +usr/share/man/man3/* --- xft-2.3.6.orig/debian/libxft2-udeb.install +++ xft-2.3.6/debian/libxft2-udeb.install @@ -0,0 +1 @@ +usr/lib/*/libXft.so.* usr/lib --- xft-2.3.6.orig/debian/libxft2.install +++ xft-2.3.6/debian/libxft2.install @@ -0,0 +1 @@ +usr/lib/*/libXft.so.* --- xft-2.3.6.orig/debian/rules +++ xft-2.3.6/debian/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f +# debian/rules for the Debian libxft package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +PACKAGE = libxft2 + +%: + dh $@ --with quilt --builddirectory=build/ + +override_dh_install: + find debian/tmp -name '*.la' -delete + dh_install + +override_dh_strip: + dh_strip --dbgsym-migration='libxft2-dbg (<< 2.3.2-2~)' + +override_dh_makeshlibs: + dh_makeshlibs -V "libxft2 (>> 2.1.1)" --add-udeb=$(PACKAGE)-udeb --- xft-2.3.6.orig/debian/source/format +++ xft-2.3.6/debian/source/format @@ -0,0 +1 @@ +1.0 --- xft-2.3.6.orig/debian/watch +++ xft-2.3.6/debian/watch @@ -0,0 +1,3 @@ +#git=https://gitlab.freedesktop.org/xorg/lib/libXft.git +version=3 +https://xorg.freedesktop.org/releases/individual/lib/ libXft-(.*)\.tar\.gz