aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2020-11-22 12:41:22 +0100
committerXavier Del Campo Romero <xavi.dcr@tutanota.com>2023-10-05 14:32:07 +0200
commit523f0ee23d55ebfa7710dcdb62b4d41616fe57f1 (patch)
tree6f90f616084ec70ca7999cf8fea2565d397fa32e
parent5cfe2240ce3bfd7404416f428f962dce9ec25e1c (diff)
downloaddino-523f0ee23d55ebfa7710dcdb62b4d41616fe57f1.tar.gz
Further adjustments for handy-1
-rw-r--r--.github/workflows/build.yml4
-rw-r--r--main/CMakeLists.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60d587e9..6960e194 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,8 +5,10 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
+ - run: echo "deb http://deb.debian.org/debian stable-backports main" | sudo tee /etc/apt/sources.list.d/backports.list
+ - run: curl -s https://ftp-master.debian.org/keys/archive-key-10.asc | sudo apt-key add -
- run: sudo apt-get update
- - run: sudo apt-get install -y build-essential gettext cmake valac libgee-0.8-dev libsqlite3-dev libgtk-3-dev libnotify-dev libgpgme-dev libsoup2.4-dev libgcrypt20-dev libqrencode-dev libgspell-1-dev libnice-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libsrtp2-dev libwebrtc-audio-processing-dev
+ - run: sudo apt-get install -y build-essential gettext cmake valac libgee-0.8-dev libsqlite3-dev libgtk-3-dev libnotify-dev libgpgme-dev libsoup2.4-dev libgcrypt20-dev libqrencode-dev libgspell-1-dev libnice-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libsrtp2-dev libwebrtc-audio-processing-dev libhandy-1-dev
- run: ./configure --with-tests --with-libsignal-in-tree
- run: make
- run: build/xmpp-vala-test
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 046b4fb8..9d0f6de5 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -214,7 +214,7 @@ OPTIONS
${MAIN_EXTRA_OPTIONS}
)
-add_definitions(${VALA_CFLAGS} -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\")
+add_definitions(${VALA_CFLAGS} -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\" -DDINO_VERSION=\"${PROJECT_VERSION}\")
add_executable(dino ${MAIN_VALA_C} ${MAIN_GRESOURCES_TARGET} src/emojichooser.c)
add_dependencies(dino ${GETTEXT_PACKAGE}-translations)
target_include_directories(dino PRIVATE src)