[arch-commits] Commit in deepin-image-editor/trunk (2 files)

[Felix Yan]

    Date: Friday, September 2, 2022 @ 08:10:40
  Author: felixonmars
Revision: 1290730

upgpkg: deepin-image-editor 1.0.18-1

Modified:
  deepin-image-editor/trunk/PKGBUILD
  deepin-image-editor/trunk/remove-broken-flags.patch

---------------------------+
 PKGBUILD                  |    8 ++++----
 remove-broken-flags.patch |   20 +++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-02 08:10:27 UTC (rev 1290729)
+++ PKGBUILD	2022-09-02 08:10:40 UTC (rev 1290730)
@@ -1,18 +1,18 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-image-editor
-pkgver=1.0.15
+pkgver=1.0.18
 pkgrel=1
 pkgdesc='Public library for deepin-image-viewer and deepin-album'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/image-editor"
 license=('GPL3')
-depends=('dtkwidget' 'freeimage' 'opencv')
+depends=('dtkwidget' 'freeimage' 'libmediainfo' 'opencv')
 makedepends=('cmake' 'ninja' 'qt5-tools')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/image-editor/archive/$pkgver.tar.gz"
         remove-broken-flags.patch)
-sha512sums=('48a04c747a3db9f80936b2583da59a7c066bd103877be6026778edb381c75f83b251ef33d3e6655cd4af7c1d6be210cd86883ab9dbf9d4849e25a238556ce052'
-            '033b26be1d5e4c5b2d4452fa1e191cd06377eb1a6ae57adfa9a2e79ead3da2433dc26301ed0cc826c3b0daffc94119b2767cf003b41beb235bcccdcdd34f7491')
+sha512sums=('b19e6cf8b886343b94da52a3389f547ad11ea5265db62adfeabdd9112a9a1dc98d3490722c83bf9dd725eaef534ce3efbaa039f6ee1e0df1b1153f80b81e7661'
+            'd61cf129107d820e59c4243017551409cdedbbca1ec2c0860c28ffac635c412b6ed83b8f3a399ad5679fda6658a66f0c2999b8b43dfdad1f6e85c3d3a32eedd7')
 
 prepare() {
   patch -d image-editor-$pkgver -p2 < remove-broken-flags.patch

Modified: remove-broken-flags.patch
===================================================================
--- remove-broken-flags.patch	2022-09-02 08:10:27 UTC (rev 1290729)
+++ remove-broken-flags.patch	2022-09-02 08:10:40 UTC (rev 1290730)
@@ -17,19 +17,21 @@
 -endif()
 --- src/image-editor-1.0.11/libimageviewer/CMakeLists.txt.orig	2022-04-04 03:53:23.353737464 +0300
 +++ src/image-editor-1.0.11/libimageviewer/CMakeLists.txt	2022-04-04 03:53:36.255837853 +0300
-@@ -109,17 +109,6 @@
+@@ -109,19 +109,6 @@
      DESTINATION ${PREFIX}/share/libimageviewer
      FILES_MATCHING PATTERN "*.qm")
  
 -# 加速编译优化参数
--if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64")
--    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wl,-O1 -Wl,--as-needed -Wl,-E -fPIE -ffunction-sections -fdata-sections -Wl,--gc-sections -ftree-vectorize -march=loongson3a -mhard-float -mno-micromips -mno-mips16 -flax-vector-conversions -mloongson-ext2 -mloongson-mmi -z noexecstack")
--    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wl,-O1 -Wl,--as-needed -Wl,-E -fPIE -ffunction-sections -fdata-sections -Wl,--gc-sections -ftree-vectorize -march=loongson3a -mhard-float -mno-micromips -mno-mips16 -flax-vector-conversions -mloongson-ext2 -mloongson-mmi -z noexecstack")
--    SET(CMAKE_EXE_LINKER_FLAGS  "-pie")
--else()
--    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wl,-O1 -Wl,--as-needed -Wl,-E -fPIE -ffunction-sections -fdata-sections -Wl,--gc-sections")
--    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3  -Wl,-O1 -Wl,--as-needed -Wl,-E -fPIE -ffunction-sections -fdata-sections -Wl,--gc-sections")
--    SET(CMAKE_EXE_LINKER_FLAGS  "-pie")
+-if (NOT(CMAKE_BUILD_TYPE STREQUAL "Debug"))
+-    if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64")
+-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wl,-O1 -Wl,--as-needed -Wl,-E -fPIE -ffunction-sections -fdata-sections -Wl,--gc-sections -ftree-vectorize -march=loongson3a -mhard-float -mno-micromips -mno-mips16 -flax-vector-conversions -mloongson-ext2 -mloongson-mmi -z noexecstack")
+-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wl,-O1 -Wl,--as-needed -Wl,-E -fPIE -ffunction-sections -fdata-sections -Wl,--gc-sections -ftree-vectorize -march=loongson3a -mhard-float -mno-micromips -mno-mips16 -flax-vector-conversions -mloongson-ext2 -mloongson-mmi -z noexecstack")
+-        SET(CMAKE_EXE_LINKER_FLAGS  "-pie")
+-    else()
+-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wl,-O1 -Wl,--as-needed -Wl,-E -fPIE -ffunction-sections -fdata-sections -Wl,--gc-sections")
+-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3  -Wl,-O1 -Wl,--as-needed -Wl,-E -fPIE -ffunction-sections -fdata-sections -Wl,--gc-sections")
+-        SET(CMAKE_EXE_LINKER_FLAGS  "-pie")
+-    endif()
 -endif()
 -
  if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "sw_64")