Release 15.1

Updated changelog
Fix build on various architectures
2017-09-08 18:08:28 +02:00 · 2017-09-08 18:08:18 +02:00 · 2017-09-08 17:37:40 +02:00 · 2017-09-08 17:37:01 +02:00 · 2017-09-08 17:04:10 +02:00 · 2017-09-08 16:35:24 +02:00
11 changed files with 33 additions and 24 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,10 +84,10 @@ if( NOT IMLIB_BUILD_WITH_X )
 endif( NOT IMLIB_BUILD_WITH_X )


+add_definitions( -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_WITH_GETLINE )
+
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  add_definitions( -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE -D_DEFAULT_SOURCE )
-else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  add_definitions( -D_WITH_GETLINE )
+  add_definitions( -D_POSIX_C_SOURCE=200809L )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")


@@ -147,6 +147,7 @@ set( SOURCES src/config.c
             src/util/cache.c
             src/util/color.c
             src/util/gradient.c
+             src/util/uevent.c
             src/util/window.c )

 if( ENABLE_BATTERY )
--- a/5
+++ b/5
@@ -1,3 +1,7 @@
+2017-09-08 15.1
+- Fixes:
+  - Fixed build on non-Linux and non-x86 systems
+
 2017-09-02 15.0
 - Fixes:
  - Clock, executors and other timers fire correctly after waking up from suspend
@@ -947,3 +951,4 @@ released tint-0.2
 - fork ttm projet from p://code.google.com/p/ttm/ (by Pål Staurland staura@gmail.com)
  while the projet is no longer in developpement, have not changed the name of 'tint'.
 .
+.
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# Latest stable release: 15.0
-Changes: https://gitlab.com/o9000/tint2/blob/15.0/ChangeLog
+# Latest stable release: 15.1
+Changes: https://gitlab.com/o9000/tint2/blob/15.1/ChangeLog

 Documentation: [doc/tint2.md](doc/tint2.md)

@@ -8,7 +8,7 @@ Compile it with (after you install the [dependencies](https://gitlab.com/o9000/t
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 15.0
+git checkout 15.1
 mkdir build
 cd build
 cmake ..
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -199,9 +199,9 @@ pre {
 </style>
 </head>
 <body>
-<h1 id="latest-stable-release-15-0"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">15.0</span><a name="latest-stable-release-15-0" href="#latest-stable-release-15-0" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/15.0/ChangeLog">https://gitlab.com/o9000/tint2/blob/15.0/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
+<h1 id="latest-stable-release-15-1"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">15.1</span><a name="latest-stable-release-15-1" href="#latest-stable-release-15-1" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/15.1/ChangeLog">https://gitlab.com/o9000/tint2/blob/15.1/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 15.0
+git checkout 15.1
 mkdir build
 cd build
 cmake ..
--- a/doc/tint2.1
+++ b/doc/tint2.1
@@ -1,4 +1,4 @@
-.TH TINT2 1 "2017\-09\-02" 15.0
+.TH TINT2 1 "2017\-09\-08" 15.1
 .SH NAME
 .PP
 tint2 \- lightweight panel/taskbar
--- a/doc/tint2.md
+++ b/doc/tint2.md
@@ -1,4 +1,4 @@
-# TINT2 1 "2017-09-02" 15.0
+# TINT2 1 "2017-09-08" 15.1

 ## NAME
 tint2 - lightweight panel/taskbar
--- a/src/main.c
+++ b/src/main.c
@@ -576,30 +576,30 @@ void handle_x_events()
    }
 }

-void prepare_fd_set(fd_set *fd_set, int *max_fd)
+void prepare_fd_set(fd_set *set, int *max_fd)
 {
-    FD_ZERO(fd_set);
-    FD_SET(server.x11_fd, fd_set);
+    FD_ZERO(set);
+    FD_SET(server.x11_fd, set);
    *max_fd = server.x11_fd;
    if (sigchild_pipe_valid) {
-        FD_SET(sigchild_pipe[0], fd_set);
+        FD_SET(sigchild_pipe[0], set);
        *max_fd = MAX(*max_fd, sigchild_pipe[0]);
    }
    for (GList *l = panel_config.execp_list; l; l = l->next) {
        Execp *execp = (Execp *)l->data;
        int fd = execp->backend->child_pipe_stdout;
        if (fd > 0) {
-            FD_SET(fd, fd_set);
+            FD_SET(fd, set);
            *max_fd = MAX(*max_fd, fd);
        }
        fd = execp->backend->child_pipe_stderr;
        if (fd > 0) {
-            FD_SET(fd, fd_set);
+            FD_SET(fd, set);
            *max_fd = MAX(*max_fd, fd);
        }
    }
    if (uevent_fd > 0) {
-        FD_SET(uevent_fd, fd_set);
+        FD_SET(uevent_fd, set);
        *max_fd = MAX(*max_fd, uevent_fd);
    }
 }
@@ -742,13 +742,13 @@ void run_tint2_event_loop()
        if (panel_refresh)
            handle_panel_refresh();

-        fd_set fd_set;
+        fd_set fds;
        int max_fd;
-        prepare_fd_set(&fd_set, &max_fd);
+        prepare_fd_set(&fds, &max_fd);

        // Wait for an event and handle it
        ts_event_read = 0;
-        if (XPending(server.display) > 0 || select(max_fd + 1, &fd_set, 0, 0, get_next_timeout()) >= 0) {
+        if (XPending(server.display) > 0 || select(max_fd + 1, &fds, 0, 0, get_next_timeout()) >= 0) {
 #ifdef HAVE_TRACING
            start_tracing((void*)run_tint2_event_loop);
 #endif
--- a/src/signals.c
+++ b/src/signals.c
@@ -29,7 +29,7 @@ void init_signals()
    // Set signal handlers
    signal_pending = 0;

-    struct sigaction sa_chld = {.sa_handler = SIG_DFL, .sa_flags = SA_NOCLDWAIT | SA_RESTART};
+    struct sigaction sa_chld = {.sa_handler = SIG_IGN};
    sigaction(SIGCHLD, &sa_chld, 0);

    struct sigaction sa = {.sa_handler = signal_handler, .sa_flags = SA_RESTART};
--- a/src/util/area.c
+++ b/src/util/area.c
@@ -1173,7 +1173,7 @@ double compute_control_point_offset(Area *area, Offset *offset)
    double height = element_area->height;
    double radius = sqrt(element_area->width * element_area->width + element_area->height * element_area->height) / 2.0;

-    double left, top;
+    double left = 0, top = 0;
    if (offset->element == ELEMENT_SELF) {
        left = 0;
        top = 0;
--- a/src/util/common.c
+++ b/src/util/common.c
@@ -40,7 +40,9 @@
 #include <sys/time.h>
 #include <errno.h>
 #include <dirent.h>
+#if !defined(__OpenBSD__)
 #include <wordexp.h>
+#endif

 #ifdef HAVE_RSVG
 #include <librsvg/rsvg.h>
@@ -397,6 +399,7 @@ pid_t tint_exec(const char *command,
            chdir(dir);
        close_all_fds();
        if (terminal) {
+#if !defined(__OpenBSD__)
            fprintf(stderr, "tint2: executing in x-terminal-emulator: %s\n", command);
            wordexp_t words;
            words.we_offs = 2;
@@ -405,6 +408,7 @@ pid_t tint_exec(const char *command,
                words.we_wordv[1] = (char*)"-e";
                execvp("x-terminal-emulator", words.we_wordv);
            }
+#endif
            fprintf(stderr, "tint2: could not execute command in x-terminal-emulator: %s, executting in shell\n", command);
        }
        execlp("sh", "sh", "-c", command, NULL);
--- a/src/util/gradient.h
+++ b/src/util/gradient.h
@@ -67,11 +67,10 @@ void cleanup_gradient(GradientClass *g);
 // Gradient instances associated to Areas

 struct Area;
-typedef struct Area Area;

 typedef struct GradientInstance {
    GradientClass *gradient_class;
-    Area *area;
+    struct Area *area;
    cairo_pattern_t *pattern;
 } GradientInstance;
Author	SHA1	Message	Date
o9000	63c3690fa8	Release 15.1	2017-09-08 18:08:28 +02:00
o9000	e2ece2c35b	Updated changelog	2017-09-08 18:08:18 +02:00
o9000	86d6e96f7a	Fix build on various architectures	2017-09-08 17:37:40 +02:00
o9000	87e1ccc6bf	Fix build on various architectures	2017-09-08 17:37:01 +02:00
o9000	aa355e22f9	Fix build on various architectures	2017-09-08 17:04:10 +02:00
o9000	d21f758158	Fix build on various architectures	2017-09-08 16:35:24 +02:00
o9000	f2741116a7	Fix build on non-x86 architectures	2017-09-05 19:11:13 +02:00