@@ -81,45 +81,28 @@ ensure_hypr_link_libs() {
8181 hl_link=" "
8282 aq_link=" "
8383
84- for p in /usr/lib/x86_64-linux-gnu/ libhyprutils.so /usr/local/lib /libhyprutils.so /usr/local/lib64 /libhyprutils.so; do
84+ for p in /usr/local/ lib/libhyprutils.so /usr/local/lib64 /libhyprutils.so /usr/lib/x86_64-linux-gnu /libhyprutils.so; do
8585 [ -e " $p " ] && hu_link=" $p " && break
8686 done
87- for p in /usr/lib/x86_64-linux-gnu/ libhyprwire.so /usr/local/lib /libhyprwire.so /usr/local/lib64 /libhyprwire.so; do
87+ for p in /usr/local/ lib/libhyprwire.so /usr/local/lib64 /libhyprwire.so /usr/lib/x86_64-linux-gnu /libhyprwire.so; do
8888 [ -e " $p " ] && hw_link=" $p " && break
8989 done
90- for p in /usr/lib/x86_64-linux-gnu/ libhyprlang.so /usr/local/lib /libhyprlang.so /usr/local/lib64 /libhyprlang.so; do
90+ for p in /usr/local/ lib/libhyprlang.so /usr/local/lib64 /libhyprlang.so /usr/lib/x86_64-linux-gnu /libhyprlang.so; do
9191 [ -e " $p " ] && hl_link=" $p " && break
9292 done
93- for p in /usr/lib/x86_64-linux-gnu/ libaquamarine.so /usr/local/lib /libaquamarine.so /usr/local/lib64 /libaquamarine.so; do
93+ for p in /usr/local/ lib/libaquamarine.so /usr/local/lib64 /libaquamarine.so /usr/lib/x86_64-linux-gnu /libaquamarine.so; do
9494 [ -e " $p " ] && aq_link=" $p " && break
9595 done
9696
9797 hu_script=" $PARENT_DIR /install-scripts/hyprutils.sh"
9898 hw_script=" $PARENT_DIR /install-scripts/hyprwire.sh"
9999
100- if [ -z " $hu_link " ]; then
101- echo " ${NOTE} libhyprutils linker symlink not found. Installing libhyprutils-dev..." | tee -a " $LOG "
102- install_package libhyprutils-dev 2>&1 | tee -a " $LOG " || true
103- fi
104- if [ -z " $hw_link " ]; then
105- echo " ${NOTE} libhyprwire linker symlink not found. Installing libhyprwire-dev..." | tee -a " $LOG "
106- install_package libhyprwire-dev 2>&1 | tee -a " $LOG " || true
107- fi
108- if [ -z " $hl_link " ]; then
109- echo " ${NOTE} libhyprlang linker symlink not found. Installing libhyprlang-dev..." | tee -a " $LOG "
110- install_package libhyprlang-dev 2>&1 | tee -a " $LOG " || true
111- fi
112- if [ -z " $aq_link " ]; then
113- echo " ${NOTE} libaquamarine linker symlink not found. Installing libaquamarine-dev..." | tee -a " $LOG "
114- install_package libaquamarine-dev 2>&1 | tee -a " $LOG " || true
115- fi
116-
117100 if [ -z " $hu_link " ] && [ -x " $hu_script " ]; then
118- echo " ${NOTE} Falling back to source build for hyprutils ..." | tee -a " $LOG "
101+ echo " ${NOTE} Building hyprutils from source..." | tee -a " $LOG "
119102 " $hu_script " 2>&1 | tee -a " $LOG " || true
120103 fi
121104 if [ -z " $hw_link " ] && [ -x " $hw_script " ]; then
122- echo " ${NOTE} Falling back to source build for hyprwire ..." | tee -a " $LOG "
105+ echo " ${NOTE} Building hyprwire from source..." | tee -a " $LOG "
123106 " $hw_script " 2>&1 | tee -a " $LOG " || true
124107 fi
125108}
229212 if [ -f " $CONFIG_ACTIONS_CPP " ]; then
230213 sed -ri ' s/const[[:space:]]+bool[[:space:]]+ISWINDOWGROUP[[:space:]]*=[[:space:]]*window->m_group[[:space:]]*;/const bool ISWINDOWGROUP = static_cast<bool>(window->m_group);/g' " $CONFIG_ACTIONS_CPP " || true
231214 fi
215+ CONFIG_VALUES_CPP=" src/config/values/ConfigValues.cpp"
216+ if [ -f " $CONFIG_VALUES_CPP " ]; then
217+ perl -0777 -i -pe ' s@,\s*\.deprecationNotice\s*=\s*"[^"]*"@@g' " $CONFIG_VALUES_CPP " || true
218+ fi
232219 SESSION_LOCK_CPP=" src/desktop/view/SessionLock.cpp"
233220 if [ -f " $SESSION_LOCK_CPP " ]; then
234221 perl -0777 -i -pe ' s@return e == m_self;@return e == m_self.lock();@g' " $SESSION_LOCK_CPP " || true
0 commit comments