aboutsummaryrefslogtreecommitdiff
path: root/ports/atk
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-10-07 19:35:13 +0200
committerCurtis J Bezault <curtbezault@gmail.com>2019-10-07 10:35:13 -0700
commit726c11148105a97aef39bec024fdb7c140b1b154 (patch)
tree26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/atk
parente86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff)
downloadvcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz
vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/atk')
-rw-r--r--ports/atk/CONTROL10
-rw-r--r--ports/atk/fix-encoding.patch13
-rw-r--r--ports/atk/portfile.cmake11
3 files changed, 10 insertions, 24 deletions
diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL
index fe09017e7..0fa67bfc5 100644
--- a/ports/atk/CONTROL
+++ b/ports/atk/CONTROL
@@ -1,5 +1,5 @@
-Source: atk
-Version: 2.24.0-4
-Homepage: https://developer.gnome.org/atk/
-Description: GNOME Accessibility Toolkit
-Build-Depends: glib, gettext
+Source: atk
+Version: 2.24.0-5
+Homepage: https://developer.gnome.org/atk/
+Description: GNOME Accessibility Toolkit
+Build-Depends: glib, gettext
diff --git a/ports/atk/fix-encoding.patch b/ports/atk/fix-encoding.patch
deleted file mode 100644
index c92171a48..000000000
--- a/ports/atk/fix-encoding.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/atk/atkversion.h b/atk/atkversion.h
-index 2634b0a..7bea2f3 100644
---- a/atk/atkversion.h
-+++ b/atk/atkversion.h
-@@ -3,7 +3,7 @@
- * Copyright (C) 2012 Igalia, S.L.
- * Copyright (C) 2014 Chun-wei Fan
- *
-- * Author: Alejandro Pi?eiro Iglesias <apinheiro@igalia.com>
-+ * Author: Alejandro Pineiro Iglesias <apinheiro@igalia.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake
index 60ace410d..34f639141 100644
--- a/ports/atk/portfile.cmake
+++ b/ports/atk/portfile.cmake
@@ -3,17 +3,17 @@ include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
set(ATK_VERSION 2.24.0)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/atk-${ATK_VERSION})
+
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz"
FILENAME "atk-${ATK_VERSION}.tar.xz"
- SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962)
+ SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962
+)
vcpkg_extract_source_archive_ex(
- ARCHIVE ${ARCHIVE}
OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
PATCHES
- fix-encoding.patch
fix-linux-config.patch
)
@@ -32,5 +32,4 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/atk)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/atk/COPYING ${CURRENT_PACKAGES_DIR}/share/atk/copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)