From 312324b6ad819f74230a8bec13260ba211a0f32e Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Sat, 28 Dec 2019 12:36:34 +0100 Subject: [PATCH] Update servo-freetype-sys --- src/servo-freetype-sys/debian/changelog | 4 +- src/servo-freetype-sys/debian/copyright | 54 +++++++++++-------- src/servo-freetype-sys/debian/debcargo.toml | 4 +- .../debian/patches/dylib.patch | 10 ++++ src/servo-freetype-sys/debian/patches/series | 1 + 5 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 src/servo-freetype-sys/debian/patches/dylib.patch create mode 100644 src/servo-freetype-sys/debian/patches/series diff --git a/src/servo-freetype-sys/debian/changelog b/src/servo-freetype-sys/debian/changelog index 0bbae6cdb..56decabef 100644 --- a/src/servo-freetype-sys/debian/changelog +++ b/src/servo-freetype-sys/debian/changelog @@ -1,5 +1,5 @@ rust-servo-freetype-sys (4.0.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium - * Package servo-freetype-sys 4.0.5 from crates.io using debcargo 2.2.10 + * Package servo-freetype-sys 4.0.5 from crates.io using debcargo 2.4.0 - -- Andrej Shadura Sun, 21 Jul 2019 17:57:24 -0300 + -- Andrej Shadura Sat, 28 Dec 2019 12:45:29 +0100 diff --git a/src/servo-freetype-sys/debian/copyright b/src/servo-freetype-sys/debian/copyright index d5be62ec4..076c0dd02 100644 --- a/src/servo-freetype-sys/debian/copyright +++ b/src/servo-freetype-sys/debian/copyright @@ -7,11 +7,22 @@ Files: * Copyright: 2014—2018 The Servo Project Developers License: FTL or GPL-2.0 +Files: build.rs +Copyright: 2015—2018 The Servo Project Developers +License: MPL-2.0 + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + . + On Debian GNU/Linux systems, the complete text of the Mozilla + Public License version 2.0 can be found in + `/usr/share/common-licenses/MPL-2.0'. + Files: debian/* Copyright: 2019 Debian Rust Maintainers 2019 Andrej Shadura -License: FTL or GPL-2.0 +License: FTL or GPL-2+ License: FTL The FreeType Project LICENSE @@ -180,26 +191,23 @@ License: FTL Our home page can be found at . https://www.freetype.org - . - . - -License: GPL-2.0 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301, USA. - . - On Debian GNU/Linux systems, the complete text of the GNU General - Public License version 2 can be found in - `/usr/share/common-licenses/GPL-2'. +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + . + On Debian GNU/Linux systems, the complete text of the GNU General + Public License version 2 can be found in + `/usr/share/common-licenses/GPL-2'. diff --git a/src/servo-freetype-sys/debian/debcargo.toml b/src/servo-freetype-sys/debian/debcargo.toml index d0ef76456..a0cbd5c5a 100644 --- a/src/servo-freetype-sys/debian/debcargo.toml +++ b/src/servo-freetype-sys/debian/debcargo.toml @@ -1,5 +1,5 @@ overlay = "." uploaders = ["Andrej Shadura "] excludes = ["freetype2/**"] -[source] -build_depends = ["libfreetype6-dev"] +[packages.lib] +depends = ["libfreetype6-dev"] diff --git a/src/servo-freetype-sys/debian/patches/dylib.patch b/src/servo-freetype-sys/debian/patches/dylib.patch new file mode 100644 index 000000000..00c380f9d --- /dev/null +++ b/src/servo-freetype-sys/debian/patches/dylib.patch @@ -0,0 +1,10 @@ +--- a/build.rs ++++ b/build.rs +@@ -29,6 +29,6 @@ + .build(); + let out_dir = env::var("OUT_DIR").unwrap(); + println!("cargo:rustc-link-search=native={}/lib", dst.display()); +- println!("cargo:rustc-link-lib=static=freetype"); ++ println!("cargo:rustc-link-lib=dylib=freetype"); + println!("cargo:outdir={}", out_dir); + } diff --git a/src/servo-freetype-sys/debian/patches/series b/src/servo-freetype-sys/debian/patches/series new file mode 100644 index 000000000..e6726ad93 --- /dev/null +++ b/src/servo-freetype-sys/debian/patches/series @@ -0,0 +1 @@ +dylib.patch -- 2.39.5