From 2599124bc8e581b5c9a48a6c0d1902b9de6230a6 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Tue, 16 Jul 2019 14:23:12 +0000 Subject: [PATCH 1/3] Show meson commands in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3550b640..9ea92940 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ available. ``` git clone https://github.com/irssi/irssi cd irssi -./autogen.sh -make && sudo make install +meson Build +ninja -C Build && sudo ninja -C Build install ``` #### Release source installation From ddb9d5c15f428b23ab6af60188c5375415bc03cb Mon Sep 17 00:00:00 2001 From: Ailin Nemui Date: Tue, 16 Jul 2019 17:25:12 +0200 Subject: [PATCH 2/3] update gitignore for meson stuff --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index f42839eb..79e4d4bb 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,7 @@ src/fe-fuzz/oom-* .deps .libs + +Build +subprojects/* +!subprojects/*.wrap From c3bd917cf2d93d95724e98aa5cfaaa5b5052c7be Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Wed, 17 Jul 2019 11:38:11 +0200 Subject: [PATCH 3/3] use correct libraries in travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a09b7271..896048d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ before_install: - ( cd bin ; ln -s ../meson-*/meson.py meson ) - curl -sSLf https://github.com/irssi-import/glib-travis-build/releases/download/2.58.3/travis-xenial-glib-2.58.3.tar.xz | tar xJ - export PKG_CONFIG_PATH=$HOME/glib-build/lib/x86_64-linux-gnu/pkgconfig + - export LD_LIBRARY_PATH=$HOME/glib-build/lib/x86_64-linux-gnu - popd install: