Enhancement: Fixes #201, Packaging port for FreeBSD

shell/desktop/CMakeLists.txt

@@ -41,6 +41,7 @@ target_compile_options(
 target_include_directories(
     wintc-desktop
     SYSTEM
+    BEFORE
     PRIVATE ${GLIB_INCLUDE_DIRS}
     PRIVATE ${GTK3_INCLUDE_DIRS}
     PRIVATE ${WINTC_COMGTK_INCLUDE_DIRS}

shell/run/CMakeLists.txt

@@ -56,6 +56,7 @@ target_compile_options(
 target_include_directories(
     wintc-shell-run
     SYSTEM
+    BEFORE
     PRIVATE ${GDK_INCLUDE_DIRS}
     PRIVATE ${GLIB_INCLUDE_DIRS}
     PRIVATE ${GTK3_INCLUDE_DIRS}

shell/run/src/main.c

@@ -1,6 +1,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <locale.h>
+#include <wintc-shllang.h>
 
 #include "application.h"
 #include "meta.h"
@@ -13,7 +14,7 @@ int main(
     // Set up locales
     //
     setlocale(LC_ALL, "");
-    bindtextdomain(PKG_NAME, "/usr/share/locale");
+    bindtextdomain(PKG_NAME, WINTC_LOCALE_DIR);
     textdomain(PKG_NAME);
 
     // Launch application

shell/taskband/CMakeLists.txt

@@ -80,6 +80,7 @@ target_compile_options(
 target_include_directories(
     wintc-taskband
     SYSTEM
+    BEFORE
     PRIVATE ${GARCON_INCLUDE_DIRS}
     PRIVATE ${GARCON_GTK3_INCLUDE_DIRS}
     PRIVATE ${GDK_PIXBUF_INCLUDE_DIRS}

shell/taskband/src/main.c

@@ -1,6 +1,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <locale.h>
+#include <wintc-shllang.h>
 
 #include "application.h"
 #include "meta.h"
@@ -13,7 +14,7 @@ int main(
     // Set up locales
     //
     setlocale(LC_ALL, "");
-    bindtextdomain(PKG_NAME, "/usr/share/locale");
+    bindtextdomain(PKG_NAME, WINTC_LOCALE_DIR);
     textdomain(PKG_NAME);
 
     // Launch application

shell/taskband/src/start/programslist.c

@@ -137,7 +137,7 @@ static void programs_list_append_all_programs_item(
     // Set garcon menu
     //
     GarconMenu* programs_menu    = garcon_menu_new_for_path(
-                                       "/usr/share/wintc/shell-res/start-menu.menu"
+                                       WINTC_ASSETS_DIR "/shell-res/start-menu.menu"
                                    );
     GtkWidget*  programs_submenu = garcon_gtk_menu_new(programs_menu);
 
@@ -227,7 +227,7 @@ static void programs_list_append_top_items(
 )
 {
     GarconMenu* all_entries = garcon_menu_new_for_path(
-                                  "/usr/share/wintc/shell-res/all.menu"
+                                  WINTC_ASSETS_DIR "/shell-res/all.menu"
                               );
     GError*     load_error  = NULL;
 

shell/taskband/src/start/startmenu.c

@@ -524,7 +524,7 @@ static void update_userpic(
         // FIXME: This should read from whatever the XDG path is, probably needs a
         //        g_strdup_printf for the username
         //
-        css = "* { background-image: url('/usr/share/wintc/shell-res/fpo-userpic.png'); }";
+        css = "* { background-image: url('" WINTC_ASSETS_DIR "/shell-res/fpo-userpic.png'); }";
     }
 
     // Give GTK a bump that we want to update the pic

shell/taskband/src/taskbuttons/windowmonitor.c

@@ -418,4 +418,5 @@ static gboolean on_window_button_button_released(
     }
 
     return FALSE;
-}
+}
+

shell/winver/CMakeLists.txt

@@ -45,6 +45,7 @@ target_compile_options(
 target_include_directories(
     wintc-shell-winver
     SYSTEM
+    BEFORE
     PRIVATE ${GDK_PIXBUF_INCLUDE_DIRS}
     PRIVATE ${GLIB_INCLUDE_DIRS}
     PRIVATE ${GTK3_INCLUDE_DIRS}
@@ -73,6 +74,25 @@ target_link_libraries(
     PRIVATE ${WINTC_WINBRAND_LIBRARIES}
 )
 
+# FreeBSD requires linking to libsysinfo port
+#
+if (${WINTC_PKGMGR} STREQUAL "bsdpkg")
+    wintc_resolve_library(libsysinfo SYSINFO)
+
+    target_include_directories(
+        wintc-shell-winver
+        PRIVATE ${SYSINFO_INCLUDE_DIRS}
+    )
+    target_link_directories(
+        wintc-shell-winver
+        PRIVATE ${SYSINFO_LIBRARY_DIRS}
+    )
+    target_link_libraries(
+        wintc-shell-winver
+        PRIVATE ${SYSINFO_LIBRARIES}
+    )
+endif()
+
 # Installation
 #
 wintc_configure_and_install_packaging()

shell/winver/deps

@@ -1,6 +1,7 @@
 bt,rt:gdk-pixbuf2
 bt,rt:glib2
 bt,rt:gtk3
+bt,rt:sysinfo
 bt,rt:wintc-comctl
 bt,rt:wintc-comgtk
 bt,rt:wintc-winbrand

shell/winver/src/winver.c

@@ -303,4 +303,5 @@ static void on_window_destroyed(
 )
 {
     gtk_main_quit();
-}
+}
+