aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNunoSempere <nuno.sempere@protonmail.com>2023-05-03 22:14:46 -0400
committerNunoSempere <nuno.sempere@protonmail.com>2023-05-03 22:14:46 -0400
commit3734dcd2d17de1b05841d2d624a60321efbe72c1 (patch)
tree538c40ef2d9a7ae0d96b1dde27f170190ac0c717
parent4e3bb826ba833b4d5b82d1b23dd202e982960583 (diff)
document bug fix after breaking library installation paths on my machine
-rw-r--r--README.md1
-rw-r--r--makefile6
2 files changed, 5 insertions, 2 deletions
diff --git a/README.md b/README.md
index 65f5ee2..aabb64d 100644
--- a/README.md
+++ b/README.md
@@ -77,3 +77,4 @@ Done:
### Known bugs
- [ ] Doesn't work with when Spanish is selected as the language, for some reason.
+- [ ] At some point, I tried to install libsoup-3 and borked some unknown installation option. So now I need to run rose with `GIO_MODULE_DIR=/usr/lib/x86_64-linux-gnu/gio/modules/ /bin/rose` (or put `export GIO_MODULE_DIR=/usr/lib/x86_64-linux-gnu/gio/modules/` in my .bashrc). This won't affect new users though, just double checked on a fresh machine.
diff --git a/makefile b/makefile
index 08e14f2..dfb788d 100644
--- a/makefile
+++ b/makefile
@@ -6,7 +6,7 @@
# make uninstall
## C compiler
-CC=tcc # much faster compilation than gcc
+CC=gcc # tcc: much faster, gcc: more options. Also I don't know whether tcc has error messages/debug options.
## Main file
SRC=rose.c
@@ -20,7 +20,7 @@ LIBS=`pkg-config --libs ${DEPS}`
## Optional adblocking
## depends on https://github.com/jun7/wyebadblock
-ADBLOCK='-L/usr/lib/wyebrowser/adblock.so'
+ADBLOCK=#'-L/usr/lib/wyebrowser/adblock.so'
## Plugins
LIBRE_REDIRECT=./plugins/libre_redirect/libre_redirect.c ./plugins/libre_redirect/str_replace_start.c
@@ -65,9 +65,11 @@ build: $(SRC) $(PLUGS) $(CONFIG)
find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \
sed -i "s|$(DEFAULT_DIR)|$(CURRENT_DIR)|g" {} +
# Compile rosenrot
+ GIO_MODULE_DIR=/usr/lib/x86_64-linux-gnu/gio/modules/
$(CC) $(DEBUG) $(INCS) $(PLUGS) $(SRC) -o rose $(LIBS) $(ADBLOCK)
install: rose
+ GIO_MODULE_DIR=/usr/lib/x86_64-linux-gnu/gio/modules/
cp -f rose /usr/bin
mkdir -p /usr/share/themes/rose
cp style.css /usr/share/themes/rose/