From: Alan Knowles Date: Sat, 27 Jan 2024 23:05:10 +0000 (+0800) Subject: sync X-Git-Tag: release-5.0.2~28 X-Git-Url: http://git.roojs.org/?p=roobuilder;a=commitdiff_plain;h=9802f9063da1ed169f38d18bc233c3336a83d6fb sync --- diff --git a/INSTALL.txt b/INSTALL.txt index ec91ac846..caf1b96df 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -4,8 +4,8 @@ apt-cache search '^valac-[0-9.]+$' | sort -n -r | head -n 1 | awk ' { print "sud apt-cache search '^valac-[0-9.]+-vapi$' | sort -n -r | head -n 1 | awk ' { print "sudo apt-get install -y " $1 }' | sh apt-cache search '^libvala-[0-9.]+-dev$' | sort -n -r | head -n1 | awk ' { print "sudo apt-get install -y " $1 }' | sh - -apt-cache search '^libvte-[0-9.]+-dev$' | sort -n -r | head -n1 | awk ' { print "sudo apt-get install -y " $1 }' | sh +#not needed currently +#apt-cache search '^libvte-[0-9.]+-dev$' | sort -n -r | head -n1 | awk ' { print "sudo apt-get install -y " $1 }' | sh sudo apt-get install libgtk-3-dev libgtksourceview-3.0-dev libxml2-dev libjson-glib-dev libgee-dev \ @@ -13,18 +13,12 @@ sudo apt-get install libgtk-3-dev libgtksourceview-3.0-dev libxml2-dev libjson # not sure why we are not using 4 yet? -sudo apt-get install libwebkit2gtk-3.0-dev -sudo apt-get install libwebkit2gtk-4.0-dev -sudo apt-get install libclutter-gtk-1.0-dev libgladeui-dev libsoup2.4-dev \ - libjavascriptcoregtk-3.0-dev - -// test - -# this is needed due to a bug in the 2.20 version of javascript core -sudo apt-get install libwebkit2gtk-4.0-dev=2.20.1-1 libwebkit2gtk-4.0-37=2.20.1-1 gir1.2-webkit2-4.0=2.20.1-1 \ - libjavascriptcoregtk-4.0-dev=2.20.1-1 gir1.2-javascriptcoregtk-4.0=2.20.1-1 libjavascriptcoregtk-4.0-18=2.20.1-1 +sudo apt-get install libwebkit2gtk-6.0-dev +sudo apt-get install libsoup2.0-dev libjavascriptcoregtk-6.0-dev + -./autogen.sh --prefix=/usr -sudo make install +meson setup build --prefix=/usr +cd build +ninja install \ No newline at end of file diff --git a/README.md b/README.md index 1e10e86a3..6340eba8f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Changlog --- Debian and Ubuntu packages - https://www.dropbox.com/sh/sgy9kvzkbaowa92/AAC_Yt3KWzFx8t451BiJLqQ7a?dl=0 + https://github.com/roojs/roobuilder/releases * you will need libvala, roojspacker and a few other packages @@ -28,11 +28,12 @@ Building it c) configure it. - ./autogen.sh --prefix=/usr + meson setup build --prefix=/usr d) make make install - sudo make install + cd build + ninja install e) run it @@ -44,6 +45,7 @@ Notes on updating packaging.. Update Package details. Edit the about version (check debian/changelog) + dch -U -i (auto increases release..) dch -v {release version} Build it..