Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dtkcommon for openSUSE:Factory checked in at 2022-09-01 22:09:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dtkcommon (Old) and /work/SRC/openSUSE:Factory/.dtkcommon.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dtkcommon" Thu Sep 1 22:09:59 2022 rev:5 rq:999743 version:5.5.23 Changes: -------- --- /work/SRC/openSUSE:Factory/dtkcommon/dtkcommon.changes 2022-04-22 21:54:52.354848271 +0200 +++ /work/SRC/openSUSE:Factory/.dtkcommon.new.2083/dtkcommon.changes 2022-09-01 22:10:48.732185269 +0200 @@ -1,0 +2,7 @@ +Sat Jun 25 08:28:45 UTC 2022 - Hillwood Yang <[email protected]> + +- Update version to 5.5.23 + * use $${TARGET} for QRC_PATH + * modify dconfig's file install path + +------------------------------------------------------------------- Old: ---- dtkcommon-5.5.21.tar.gz New: ---- dtkcommon-5.5.23.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtkcommon.spec ++++++ --- /var/tmp/diff_new_pack.7on2ft/_old 2022-09-01 22:10:49.240186658 +0200 +++ /var/tmp/diff_new_pack.7on2ft/_new 2022-09-01 22:10:49.244186669 +0200 @@ -17,7 +17,7 @@ # Name: dtkcommon -Version: 5.5.21 +Version: 5.5.23 Release: 0 Summary: The DTK Tools License: GPL-3.0+ @@ -25,7 +25,6 @@ URL: https://github.com/linuxdeepin/dtkcommon Source0: https://github.com/linuxdeepin/dtkcommon/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: fdupes -BuildRequires: pkgconfig(Qt5Core) BuildRequires: glib2-tools BuildRequires: libQt5Core-private-headers-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ dtkcommon-5.5.21.tar.gz -> dtkcommon-5.5.23.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcommon-5.5.21/.github/workflows/backup-to-gitlab.yml new/dtkcommon-5.5.23/.github/workflows/backup-to-gitlab.yml --- old/dtkcommon-5.5.21/.github/workflows/backup-to-gitlab.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dtkcommon-5.5.23/.github/workflows/backup-to-gitlab.yml 2022-05-20 10:41:45.000000000 +0200 @@ -0,0 +1,52 @@ +name: backup to gitlab +on: [push] + +concurrency: + group: ${{ github.workflow }} + cancel-in-progress: true + +jobs: + backup-to-gitlab: + if: github.repository_owner == 'linuxdeepin' + name: backup-to-gitlab + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + repository: "linuxdeepin/jenkins-bridge-client" + path: jenkins-bridge-client + + - name: Install Client + run: | + cd $GITHUB_WORKSPACE/jenkins-bridge-client + go build . + sudo install -Dvm755 jenkins-bridge-client -t /usr/bin/ + - name: Trigger sync + id: generate-runid + run: | + echo "::set-output name=RUN_ID::$(jenkins-bridge-client -triggerSync -token '${{ secrets.BRIDGETOKEN }}')" + - name: Print log + run: | + jenkins-bridge-client -printlog -token "${{ secrets.BRIDGETOKEN }}" -runid "${{ steps.generate-runid.outputs.RUN_ID }}" + + backup-to-gitee: + if: github.repository_owner == 'linuxdeepin' + runs-on: ubuntu-latest + steps: + - name: create-repo + run: | + repo=${{ github.event.repository.name }} + homepage="https://github.com/linuxdeepin/${repo}"; + description="mirror of ${homepage}" + # remove '.' prefix + repo=${repo#"."} + curl -X POST --header 'Content-Type: application/json;charset=UTF-8' 'https://gitee.com/api/v5/enterprises/linuxdeepin/repos' -d '{"private": 1,"access_token":"${{ secrets.GITEE_SYNC_TOKEN }}","name":"'"$repo"'","description":"'"$description"'","homepage":"'"$homepage"'","has_issues":"false","has_wiki":"false","can_comment":"false"}' || true + - name: push + run: | + git clone --bare https://github.com/linuxdeepin/${{ github.event.repository.name }}.git .git + repo=${{ github.event.repository.name }} + # remove '.' prefix + repo=${repo#"."} + git remote set-url origin https://myml:${{ secrets.GITEE_SYNC_TOKEN }}@gitee.com/linuxdeepin/${repo}.git + git push -f --all --prune origin + git push --tags origin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcommon-5.5.21/.github/workflows/call-build-deb.yml new/dtkcommon-5.5.23/.github/workflows/call-build-deb.yml --- old/dtkcommon-5.5.21/.github/workflows/call-build-deb.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dtkcommon-5.5.23/.github/workflows/call-build-deb.yml 2022-05-20 10:41:45.000000000 +0200 @@ -0,0 +1,15 @@ +name: Call build-deb +on: + pull_request_target: + paths-ignore: + - ".github/workflows/**" + +concurrency: + group: ${{ github.workflow }}-pull/${{ github.event.number }} + cancel-in-progress: true + +jobs: + check_job: + uses: linuxdeepin/.github/.github/workflows/build-deb.yml@master + secrets: + BridgeToken: ${{ secrets.BridgeToken }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcommon-5.5.21/.github/workflows/call-build-distribution.yml new/dtkcommon-5.5.23/.github/workflows/call-build-distribution.yml --- old/dtkcommon-5.5.21/.github/workflows/call-build-distribution.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dtkcommon-5.5.23/.github/workflows/call-build-distribution.yml 2022-05-20 10:41:45.000000000 +0200 @@ -0,0 +1,17 @@ +name: Call build-distribution +on: + push: + paths-ignore: + - ".github/workflows/**" + pull_request_target: + paths-ignore: + - ".github/workflows/**" + +jobs: + check_job: + uses: linuxdeepin/.github/.github/workflows/build-distribution.yml@master + secrets: + BUILD_GPG_PRIVATE_KEY: ${{ secrets.BUILD_GPG_PRIVATE_KEY }} + BUILD_SSH_PRIVATE_KEY: ${{ secrets.BUILD_SSH_PRIVATE_KEY }} + WEBDAV_PASSWD: ${{ secrets.WEBDAV_PASSWD }} + WEBDAV_USER: ${{ secrets.WEBDAV_USER }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcommon-5.5.21/.github/workflows/call-chatOps.yml new/dtkcommon-5.5.23/.github/workflows/call-chatOps.yml --- old/dtkcommon-5.5.21/.github/workflows/call-chatOps.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dtkcommon-5.5.23/.github/workflows/call-chatOps.yml 2022-05-20 10:41:45.000000000 +0200 @@ -0,0 +1,10 @@ +name: chatOps +on: + issue_comment: + types: [created] + +jobs: + chatopt: + uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master + secrets: + APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcommon-5.5.21/.github/workflows/call-commitlint.yml new/dtkcommon-5.5.23/.github/workflows/call-commitlint.yml --- old/dtkcommon-5.5.21/.github/workflows/call-commitlint.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dtkcommon-5.5.23/.github/workflows/call-commitlint.yml 2022-05-20 10:41:45.000000000 +0200 @@ -0,0 +1,11 @@ +name: Call commitlint +on: + pull_request_target: + +concurrency: + group: ${{ github.workflow }}-pull/${{ github.event.number }} + cancel-in-progress: true + +jobs: + check_job: + uses: linuxdeepin/.github/.github/workflows/commitlint.yml@master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcommon-5.5.21/cmake/Dtk/DtkInstallDConfigConfig.cmake new/dtkcommon-5.5.23/cmake/Dtk/DtkInstallDConfigConfig.cmake --- old/dtkcommon-5.5.21/cmake/Dtk/DtkInstallDConfigConfig.cmake 2021-12-21 04:23:24.000000000 +0100 +++ new/dtkcommon-5.5.23/cmake/Dtk/DtkInstallDConfigConfig.cmake 2022-05-20 10:41:45.000000000 +0200 @@ -13,10 +13,13 @@ set(${SUBPATH} ${SUBPATH_PATH} PARENT_SCOPE) endfunction() +if(NOT DEFINED DSG_DATA_DIR) + set(DSG_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/dsg) +endif() +add_definitions(-DDSG_DATA_DIR=${DSG_DATA_DIR}) # deploy some `meta` 's configure. # -# option USE_OPT_DIR - using uos standard to install destination directory. # FILES - deployed files. # BASE - used to get subpath, if it's empty, only copy files, and ignore it's subpath structure. # APPID - working for the app. @@ -26,18 +29,11 @@ # dconfig_meta_files(APPID dconfigexample BASE ./configs FILES ./configs/example.json ./configs/a/example.json) # function(DCONFIG_META_FILES) - set(options USE_OPT_DIR) set(oneValueArgs BASE APPID COMMONID) set(multiValueArgs FILES) cmake_parse_arguments(METAITEM "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - if(DEFINED ENV{DSG_DATA_DIR}) - set(DSG_DATA_DIR $ENV{DSG_DATA_DIR}) - else() - set(DSG_DATA_DIR "/usr/share/dsg") - endif() - foreach(_current_FILE ${METAITEM_FILES}) set(SUBPATH "") if (DEFINED METAITEM_BASE) @@ -45,11 +41,7 @@ endif() if (DEFINED METAITEM_APPID) - if (${METAITEM_USE_OPT_DIR} STREQUAL "TRUE") - install(FILES "${_current_FILE}" DESTINATION /opt/apps/${METAITEM_APPID}/files/schemas/configs/${SUBPATH}) - else() - install(FILES "${_current_FILE}" DESTINATION /usr/share/dsg/apps/${METAITEM_APPID}/configs/${SUBPATH}) - endif() + install(FILES "${_current_FILE}" DESTINATION ${DSG_DATA_DIR}/configs/${METAITEM_APPID}/${SUBPATH}) elseif (DEFINED METAITEM_COMMONID) install(FILES ${_current_FILE} DESTINATION ${DSG_DATA_DIR}/configs/${SUBPATH}) else() @@ -82,12 +74,6 @@ message(FATAL_ERROR "Please set meta_name for the override configuration." ${FILES}) endif() - if(DEFINED ENV{DSG_DATA_DIR}) - set(DSG_DATA_DIR $ENV{DSG_DATA_DIR}) - else() - set(DSG_DATA_DIR "/usr/share/dsg") - endif() - foreach(_current_FILE ${OVERRIDEITEM_FILES}) set(SUBPATH "") if (DEFINED OVERRIDEITEM_BASE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcommon-5.5.21/features/dtk_install_dconfig.prf new/dtkcommon-5.5.23/features/dtk_install_dconfig.prf --- old/dtkcommon-5.5.21/features/dtk_install_dconfig.prf 2021-12-21 04:23:24.000000000 +0100 +++ new/dtkcommon-5.5.23/features/dtk_install_dconfig.prf 2022-05-20 10:41:45.000000000 +0200 @@ -1,19 +1,20 @@ # This prf file is used to deploy files that dconfig's meta and override configure. # -# get enviroment `$$DSG_DATA_DIR` 's value, it???s consistent with class DConfigFile code. -defineReplace(getDSGDataDir) { - isEmpty($$DSG_DATA_DIR) return ("/usr/share/dsg") - return ($$DSG_DATA_DIR) +# get variable `$$DSG_DATA_DIR` 's value, it???s consistent with class DConfigFile code. +isEmpty(DSG_DATA_DIR) { + isEmpty(PREFIX) { + DSG_DATA_DIR=/usr/share/dsg + } else { + DSG_DATA_DIR=$$PREFIX/share/dsg + } } - # deploy some `meta` 's configure. # # files - deployed files. # base - used to get subpath, if it's empty, only copy files, and ignore it's subpath structure. # appid - working for the app, if it's empty, depending on `TEMPLATE`. # commonid - working for common, if it's empyt, depending on `TEMPLATE`. -# use_opt_dir - using uos standard to install destination directory. # # e.g: # dconfig_example.files += \ @@ -30,25 +31,18 @@ eval(dconfig_meta_$${metaitem}.files = $$eval($${metaitem}.files)) eval(dconfig_meta_$${metaitem}.base = $$eval($${metaitem}.base)) isEmpty($${metaitem}.appid) { + is_common_configuration=true isEmpty($${metaitem}.commonid) { equals(TEMPLATE, app) { - !isEmpty($${metaitem}.use_opt_dir) { - eval(dconfig_meta_$${metaitem}.path = /opt/apps/$$TARGET/files/schemas/configs) - } else { - eval(dconfig_meta_$${metaitem}.path = /usr/share/dsg/apps/$$TARGET/configs) - } - } else { - eval(dconfig_meta_$${metaitem}.path = $$getDSGDataDir()/configs/) + eval(dconfig_meta_$${metaitem}.path = $$DSG_DATA_DIR/configs/$$TARGET/) + is_common_configuration=false } - } else { - eval(dconfig_meta_$${metaitem}.path = $$getDSGDataDir()/configs/) } - } else { - !isEmpty($${metaitem}.use_opt_dir) { - eval(dconfig_meta_$${metaitem}.path = /opt/apps/$$eval($${overrideitem}.appid/files/schemas/configs)) - } else { - eval(dconfig_meta_$${metaitem}.path = /usr/share/dsg/apps/$$eval($${overrideitem}.appid/configs)) + if ($$is_common_configuration) { + eval(dconfig_meta_$${metaitem}.path = $$DSG_DATA_DIR/configs) } + } else { + eval(dconfig_meta_$${metaitem}.path = $$DSG_DATA_DIR/configs/$$eval($${metaitem}.appid)) } INSTALLS += dconfig_meta_$${metaitem} } @@ -81,9 +75,9 @@ eval(dconfig_override_$${overrideitem}.base = $$eval($${overrideitem}.base)) isEmpty($${overrideitem}.meta_name) : error("Please set meta_name for the override configuration." $${overrideitem}) isEmpty($${overrideitem}.appid) { - eval(dconfig_override_$${overrideitem}.path = $$getDSGDataDir()/configs/overrides/$$eval($${overrideitem}.meta_name)) + eval(dconfig_override_$${overrideitem}.path = $$DSG_DATA_DIR/configs/overrides/$$eval($${overrideitem}.meta_name)) } else { - eval(dconfig_override_$${overrideitem}.path = $$getDSGDataDir()/configs/overrides/$$eval($${overrideitem}.appid)/$$eval($${overrideitem}.meta_name)) + eval(dconfig_override_$${overrideitem}.path = $$DSG_DATA_DIR/configs/overrides/$$eval($${overrideitem}.appid)/$$eval($${overrideitem}.meta_name)) } INSTALLS += dconfig_override_$${overrideitem} } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dtkcommon-5.5.21/features/dtk_translation.prf new/dtkcommon-5.5.23/features/dtk_translation.prf --- old/dtkcommon-5.5.21/features/dtk_translation.prf 2021-12-21 04:23:24.000000000 +0100 +++ new/dtkcommon-5.5.23/features/dtk_translation.prf 2022-05-20 10:41:45.000000000 +0200 @@ -29,7 +29,7 @@ # <file>dtkwidget_ast.qm</file> # </qresource> #</RCC> - QRC_PATH = $$ROOT_DIR/translations/$${BASENAME}_translations.qrc + QRC_PATH = $$ROOT_DIR/translations/$${TARGET}_translations.qrc message ("Create static translations file $${QRC_PATH}") QRC_CONTENT = "<RCC>"
