Package: literki
Version: 0.0.0+20100113.git1da40724-1.2
Followup-For: Bug #892344
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/control: Build-depend on pkg-config.
  * d/p/06_use_pkg-config.patch: Use pkg-config instead of removed
    freetype-config to fix FTBFS.

Thanks for considering the patch.

Logan

-- System Information:
Debian Release: bullseye/sid
  APT prefers focal
  APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.4.0-18-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru literki-0.0.0+20100113.git1da40724/debian/control 
literki-0.0.0+20100113.git1da40724/debian/control
--- literki-0.0.0+20100113.git1da40724/debian/control   2016-01-24 
07:42:40.000000000 -0500
+++ literki-0.0.0+20100113.git1da40724/debian/control   2020-03-22 
23:17:53.000000000 -0400
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian freesmartphone.org Team 
<pkg-fso-ma...@lists.alioth.debian.org>
 Uploaders: Timo Jyrinki <t...@debian.org>
-Build-Depends: debhelper (>= 7), libfreetype6-dev, libpng-dev, libfakekey-dev, 
libxi-dev, libxcb1-dev, libxrender-dev, libxrandr-dev, libpng++-dev
+Build-Depends: debhelper (>= 7), libfreetype6-dev, libpng-dev, libfakekey-dev, 
libxi-dev, libxcb1-dev, libxrender-dev, libxrandr-dev, libpng++-dev, pkg-config
 Standards-Version: 3.8.4
 Homepage: http://git.senfdax.de/?p=literki
 Vcs-Git: http://git.debian.org/git/pkg-fso/literki.git
diff -Nru 
literki-0.0.0+20100113.git1da40724/debian/patches/06_use_pkg-config.patch 
literki-0.0.0+20100113.git1da40724/debian/patches/06_use_pkg-config.patch
--- literki-0.0.0+20100113.git1da40724/debian/patches/06_use_pkg-config.patch   
1969-12-31 19:00:00.000000000 -0500
+++ literki-0.0.0+20100113.git1da40724/debian/patches/06_use_pkg-config.patch   
2020-03-22 23:17:53.000000000 -0400
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,8 +4,8 @@
+ 
+ CXXCOMPILE=g++
+ 
+-CFLAGS=-g `freetype-config --cflags`
+-LDFLAGS=-g `freetype-config --libs`
++CFLAGS=-g `pkg-config --cflags freetype2`
++LDFLAGS=-g `pkg-config --libs freetype2`
+ 
+ %.o: %.cpp
+       $(CXXCOMPILE) $(CFLAGS) -c $<
diff -Nru literki-0.0.0+20100113.git1da40724/debian/patches/series 
literki-0.0.0+20100113.git1da40724/debian/patches/series
--- literki-0.0.0+20100113.git1da40724/debian/patches/series    2016-01-26 
11:23:32.000000000 -0500
+++ literki-0.0.0+20100113.git1da40724/debian/patches/series    2020-03-22 
23:17:36.000000000 -0400
@@ -3,3 +3,4 @@
 04_fix_desktop.diff
 05_fix_ftbfs_binutils-gold.patch
 libpng16.patch
+06_use_pkg-config.patch

Reply via email to