This repository has been archived by the owner on Oct 11, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'linuxdeepin:master' into ninemaster
- Loading branch information
Showing
59 changed files
with
2,796 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package: | ||
id: io.github.AwesomeBump | ||
name: AwesomeBump | ||
version: 3.1.1.1 | ||
kind: app | ||
description: | | ||
AwesomeBump is a free program written using Qt library designed to generate normal | ||
runtime: | ||
id: org.deepin.Runtime | ||
version: 23.0.0 | ||
|
||
source: | ||
kind: git | ||
url: https://github.com/kmkolasinski/AwesomeBump.git | ||
commit: f9fad16e066e366636dad05cb4c53c9e0aa2d729 | ||
patch: patches/0001-fix.patch | ||
|
||
depends: | ||
- id: qtscript/5.15.7 | ||
type: runtime | ||
|
||
build: | ||
kind: qmake | ||
maunal: | ||
configure: | | ||
cd Sources | ||
cp resources/icons/icon.png resources/icons/AwesomeBump.png | ||
qmake -makefile ${conf_args} ${extra_args} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
From 0f626110765c9a4d0c76c9a2d23c240bc26397d8 Mon Sep 17 00:00:00 2001 | ||
From: van <[email protected]> | ||
Date: Fri, 24 May 2024 23:32:37 +0800 | ||
Subject: [PATCH] fix | ||
|
||
--- | ||
AwesomeBump.desktop | 8 ++++++++ | ||
Sources/Sources.pro | 19 +++++++++++++++---- | ||
2 files changed, 23 insertions(+), 4 deletions(-) | ||
create mode 100644 AwesomeBump.desktop | ||
|
||
diff --git a/AwesomeBump.desktop b/AwesomeBump.desktop | ||
new file mode 100644 | ||
index 0000000..102dcfe | ||
--- /dev/null | ||
+++ b/AwesomeBump.desktop | ||
@@ -0,0 +1,8 @@ | ||
+[Desktop Entry] | ||
+Exec=AwesomeBump | ||
+Name=AwesomeBump | ||
+Icon=AwesomeBump | ||
+StartupNotify=false | ||
+Terminal=false | ||
+Type=Application | ||
+X-Deepin-Vendor=user-custom | ||
diff --git a/Sources/Sources.pro b/Sources/Sources.pro | ||
index dbdcace..2fa90be 100644 | ||
--- a/Sources/Sources.pro | ||
+++ b/Sources/Sources.pro | ||
@@ -52,7 +52,7 @@ write_file("$$TOP_DIR/workdir/current", SPEC) | ||
# continues to look for these resource files in its current | ||
# directory's subfolders (Config/* and Core/*) when using | ||
# qmake to compile | ||
-DEFINES += RESOURCE_BASE=\\\"./\\\" | ||
+ | ||
|
||
VPATH += ../shared | ||
INCLUDEPATH += ../shared include utils utils/QtnProperty utils/contextinfo | ||
@@ -165,9 +165,7 @@ DISTFILES += \ | ||
|
||
# install additional files into target destination | ||
# (require "make install") | ||
-config.path = $$DESTDIR | ||
-config.files += $$TOP_DIR/Bin/Configs $$TOP_DIR/Bin/Core | ||
-INSTALLS += config | ||
+ | ||
|
||
exists("utils/qtcopydialog/qtcopydialog.pri") { | ||
message("*** Adding 'copydialog' module.") | ||
@@ -196,3 +194,16 @@ exists("utils/fervor/Fervor.pri") { | ||
FV_APP_VERSION = $$VERSION_FULL | ||
include("utils/fervor/Fervor.pri") | ||
} | ||
+ | ||
+BINDIR = $$PREFIX/bin | ||
+DATADIR = $$PREFIX/share | ||
+DEFINES += RESOURCE_BASE=\\\"$$BINDIR/\\\" | ||
+ | ||
+target.path = $$BINDIR | ||
+desktop.files = ../AwesomeBump.desktop | ||
+desktop.path = $$DATADIR/applications/ | ||
+icon.files = resources/icons/AwesomeBump.png | ||
+icon.path= $$DATADIR/icons/hicolor/256x256/apps/ | ||
+config.path = $$BINDIR | ||
+config.files += $$TOP_DIR/Bin/Configs $$TOP_DIR/Bin/Core | ||
+INSTALLS += target desktop icon config | ||
\ No newline at end of file | ||
-- | ||
2.33.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package: | ||
id: io.github.EmuDiscer | ||
name: EmuDiscer | ||
version: 1.1.0 | ||
kind: app | ||
description: | | ||
EmuDiscer recognizes which system the game is made for, and lauches the right emulator. | ||
runtime: | ||
id: org.deepin.Runtime | ||
version: 23.0.0 | ||
|
||
source: | ||
kind: git | ||
url: https://github.com/LMauricius/EmuDiscer.git | ||
commit: 02af5b8b0d07caa7d4e1b969f9962a5951ca075a | ||
patch: patches/0001-install.patch | ||
|
||
build: | ||
kind: qmake |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
From 9aedec24aa5b3fda1268b3280660ca0c264b322a Mon Sep 17 00:00:00 2001 | ||
From: wjyrich <[email protected]> | ||
Date: Sat, 25 May 2024 16:31:30 +0800 | ||
Subject: [PATCH] install | ||
|
||
--- | ||
EmuDiscer.pro | 11 ++++++++++- | ||
LMauricius.EmuDiscer.desktop | 14 +++++++------- | ||
2 files changed, 17 insertions(+), 8 deletions(-) | ||
|
||
diff --git a/EmuDiscer.pro b/EmuDiscer.pro | ||
index ebc31c9..a9b693e 100644 | ||
--- a/EmuDiscer.pro | ||
+++ b/EmuDiscer.pro | ||
@@ -59,10 +59,19 @@ DEFINES += EMUDISCER_APP_VERSION=\\\"$$VERSION\\\" | ||
|
||
# Default rules for deployment. | ||
qnx: target.path = /tmp/$${TARGET}/bin | ||
-else: unix:!android: target.path = /opt/$${TARGET}/bin | ||
+else: unix:!android: #target.path = /opt/$${TARGET}/bin | ||
!isEmpty(target.path): INSTALLS += target | ||
|
||
RESOURCES += \ | ||
resources.qrc | ||
|
||
DISTFILES += | ||
+ | ||
+ | ||
+target.path = $$PREFIX/bin | ||
+desktop.files = LMauricius.EmuDiscer.desktop | ||
+desktop.path = $$PREFIX/share/applications/ | ||
+icons.path = $$PREFIX/share/icons/hicolor/scalable/apps | ||
+icons.files = EmuDiscer.svg | ||
+ | ||
+INSTALLS += target desktop icons | ||
diff --git a/LMauricius.EmuDiscer.desktop b/LMauricius.EmuDiscer.desktop | ||
index 2c9f46e..e41d1ca 100644 | ||
--- a/LMauricius.EmuDiscer.desktop | ||
+++ b/LMauricius.EmuDiscer.desktop | ||
@@ -1,9 +1,9 @@ | ||
[Desktop Entry] | ||
-Categories = Game; | ||
-Comment = A program for running emulators when a disc is inserted. | ||
-Exec = EmuDiscer --open-settings | ||
-Icon = EmuDiscer | ||
-Name = EmuDiscer | ||
-Terminal = false | ||
-Type = Application | ||
+Categories=Game; | ||
+Comment=A program for running emulators when a disc is inserted. | ||
+Exec=EmuDiscer | ||
+Icon=EmuDiscer | ||
+Name=EmuDiscer | ||
+Terminal=false | ||
+Type=Application | ||
|
||
-- | ||
2.33.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
package: | ||
id: io.github.Graphical-Serial-Terminal | ||
name: Graphical-Serial-Terminal | ||
version: 0.50.0.1 | ||
kind: app | ||
description: | | ||
A graphical serial terminal | ||
runtime: | ||
id: org.deepin.Runtime | ||
version: 23.0.0 | ||
|
||
depends: | ||
- id: qtserialport/5.15.7 | ||
type: runtime | ||
|
||
source: | ||
kind: git | ||
url: https://github.com/neundorf/CuteCom.git | ||
commit: efc3f0efb72f9fc7d6506f6908ca83d689a09fe1 | ||
patch: patches/0001-install.patch | ||
|
||
build: | ||
kind: cmake |
58 changes: 58 additions & 0 deletions
58
io.github.Graphical-Serial-Terminal/patches/0001-install.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
From 61761d052d74ab8c7dd04fe1bbe176e4d3ba2be2 Mon Sep 17 00:00:00 2001 | ||
From: wjyrich <[email protected]> | ||
Date: Fri, 17 May 2024 11:53:53 +0800 | ||
Subject: [PATCH] install | ||
|
||
--- | ||
CMakeLists.txt | 10 ++++++++++ | ||
ctrlcharacterspopup.cpp | 2 +- | ||
cutecom.desktop | 2 +- | ||
3 files changed, 12 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 82d4ed7..0cf8f24 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -82,3 +82,13 @@ include (CPack) | ||
|
||
add_custom_target(dist COMMAND git archive --format tar --prefix=cutecom-${CuteCom_VERSION}/ HEAD | gzip > ${CMAKE_CURRENT_BINARY_DIR}/${CPACK_SOURCE_PACKAGE_FILE_NAME}.tgz WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) | ||
|
||
+#install(TARGETS ${PROJECT_NAME} | ||
+ # DESTINATION bin) | ||
+ | ||
+install(FILES cutecom.png | ||
+ DESTINATION share/icons/hicolor/16X16/apps/) | ||
+ | ||
+ | ||
+install(FILES cutecom.desktop | ||
+ DESTINATION share/applications) | ||
+ | ||
diff --git a/ctrlcharacterspopup.cpp b/ctrlcharacterspopup.cpp | ||
index cec38d1..480cd20 100644 | ||
--- a/ctrlcharacterspopup.cpp | ||
+++ b/ctrlcharacterspopup.cpp | ||
@@ -31,7 +31,7 @@ | ||
#include <algorithm> | ||
#include <iterator> | ||
#include <map> | ||
- | ||
+#include <QPainterPath> | ||
namespace popup_widget | ||
{ | ||
namespace | ||
diff --git a/cutecom.desktop b/cutecom.desktop | ||
index 6ecf7ec..5652ad4 100644 | ||
--- a/cutecom.desktop | ||
+++ b/cutecom.desktop | ||
@@ -4,7 +4,7 @@ Name=CuteCom | ||
MimeType= | ||
GenericName=Serial Terminal | ||
Comment=A graphical serial terminal | ||
-Exec=cutecom | ||
+Exec=cutecom | ||
Icon=cutecom | ||
Path= | ||
Type=Application | ||
-- | ||
2.33.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
package: | ||
id: io.github.LANDrop-Pro | ||
name: LANDrop-Pro | ||
version: 0.1.2 | ||
kind: app | ||
description: | | ||
Drop any files to any devices on your LAN even on WAN. | ||
runtime: | ||
id: org.deepin.Runtime | ||
version: 23.0.0 | ||
|
||
source: | ||
kind: git | ||
url: https://github.com/WanMotion/LANDrop-Pro.git | ||
commit: 036b3b86f30c2def5bda1f2bd26e3db73847c4a0 | ||
|
||
build: | ||
kind: qmake | ||
manual: | ||
configure: | | ||
cd LANDrop | ||
qmake -makefile ${conf_args} ${extra_args} | ||
build: | | ||
make ${jobs} | ||
install: | | ||
make ${jobs} DESTDIR=${dest_dir} install |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package: | ||
id: io.github.MultiupMaNaGeR | ||
name: MultiupMaNaGeR | ||
version: 0.4.6.1 | ||
kind: app | ||
description: | | ||
Multiup MaNaGeR is a software written in Qt/C++ that can send files to the multiupload website : multiup.org. | ||
runtime: | ||
id: org.deepin.Runtime | ||
version: 23.0.0 | ||
|
||
source: | ||
kind: git | ||
url: https://github.com/ysard/MultiupMaNaGeR.git | ||
commit: b095c87aa328c82cd623ce26b65f2399372eef0c | ||
patch: patches/0001-install.patch | ||
|
||
build: | ||
kind: qmake |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
From b2c3a636bfbfe8c4df8681ca9a3c20215fd6e126 Mon Sep 17 00:00:00 2001 | ||
From: wjyrich <[email protected]> | ||
Date: Wed, 22 May 2024 10:46:33 +0800 | ||
Subject: [PATCH] install | ||
|
||
--- | ||
misc/multiup-manager.desktop | 4 ++-- | ||
multiupv2.pro | 8 ++++++++ | ||
2 files changed, 10 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/misc/multiup-manager.desktop b/misc/multiup-manager.desktop | ||
index b15fb10..114aef0 100644 | ||
--- a/misc/multiup-manager.desktop | ||
+++ b/misc/multiup-manager.desktop | ||
@@ -2,8 +2,8 @@ | ||
Type=Application | ||
Terminal=false | ||
Name=Multiup MaNaGeR | ||
-Exec=/usr/bin/multiup | ||
-Icon=/usr/share/pixmaps/multiup.png | ||
+Exec=multiup | ||
+Icon=multiup | ||
Comment=Upload manager for multiup.org | ||
Comment[fr_FR]=Gestionnaire d'upload pour multiup.org | ||
Comment[fr]=Gestionnaire d'upload pour multiup.org | ||
diff --git a/multiupv2.pro b/multiupv2.pro | ||
index 8e09ecd..92f2a3b 100644 | ||
--- a/multiupv2.pro | ||
+++ b/multiupv2.pro | ||
@@ -138,3 +138,11 @@ CONFIG += lrelease | ||
CONFIG += embed_translations | ||
# Default prefix in resources | ||
#QM_FILES_RESOURCE_PREFIX=/i18n/ | ||
+ | ||
+target.path = $$PREFIX/bin | ||
+desktop.files = misc/multiup-manager.desktop | ||
+desktop.path = $$PREFIX/share/applications/ | ||
+icons.path = $$PREFIX/share/icons/hicolor/16X16/apps/ | ||
+icons.files = misc/multiup.png | ||
+ | ||
+INSTALLS += target desktop icons | ||
\ No newline at end of file | ||
-- | ||
2.33.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package: | ||
id: io.github.QComicBook | ||
name: QComicBook | ||
version: 0.9.1 | ||
kind: app | ||
description: | | ||
Viewer for comic book archives that aims at convenience and simplicity | ||
runtime: | ||
id: org.deepin.Runtime | ||
version: 23.0.0 | ||
|
||
depends: | ||
- id: poppler/0.71.0.2 | ||
type: runtime | ||
|
||
source: | ||
kind: git | ||
url: https://github.com/stolowski/QComicBook.git | ||
commit: d0fc37d6f269a999a24108c5d52026bf539da279 | ||
|
||
build: | ||
kind: cmake |
Oops, something went wrong.