wok-current annotate cpige/stuff/cpige.patch @ rev 25701

Fix dep for libglamoregl.so (libepoxy), and miss file for amdgpu (thanks alanyih)
author Stanislas Leduc <shann@slitaz.org>
date Fri Apr 19 12:48:51 2024 +0000 (2 months ago)
parents 9753324921b9
children
rev   line source
pascal@25365 1 diff -ur cpigeorig/gui/callbacks.c cpige/gui/callbacks.c
pascal@25365 2 --- cpigeorig/gui/callbacks.c 2022-07-21 22:11:29.000000000 +0200
pascal@25365 3 +++ cpige/gui/callbacks.c 2022-07-28 08:43:22.000000000 +0200
pascal@25365 4 @@ -310,10 +310,10 @@
pascal@25365 5 idx = gtk_combo_box_get_active(combobox);
pascal@25365 6 if (idx == 0) /* Hour */
pascal@25365 7 {
pascal@25365 8 - gtk_spin_button_set_adjustment(spinButton, GTK_ADJUSTMENT(gtk_adjustment_new (1, 1, 12, 1, 1, 1)));
pascal@25365 9 + gtk_spin_button_set_adjustment(spinButton, GTK_ADJUSTMENT(gtk_adjustment_new (1, 1, 12, 1, 1, 0)));
pascal@25365 10 gtk_spin_button_set_value(spinButton, 1);
pascal@25365 11 } else if (idx == 1) { /* Minute */
pascal@25365 12 - gtk_spin_button_set_adjustment(spinButton, GTK_ADJUSTMENT(gtk_adjustment_new (10, 10, 30, 10, 10, 10)));
pascal@25365 13 + gtk_spin_button_set_adjustment(spinButton, GTK_ADJUSTMENT(gtk_adjustment_new (10, 10, 30, 10, 10, 0)));
pascal@25365 14 gtk_spin_button_set_value(spinButton, 10);
pascal@25365 15 } else {
pascal@25365 16 g_printf("Unknown interval type (%d)\n", idx);
pascal@25365 17 @@ -592,7 +592,7 @@
pascal@25365 18 {
pascal@25365 19 int percentage, hour, min, sec, left_sec;
pascal@25365 20 gchar statusText[100];
pascal@25365 21 - memset(statusText, 0, 100);
pascal@25435 22 + memset(statusText, 0, 100);
pascal@25365 23
pascal@25365 24 left_sec = atoi(left);
pascal@25365 25 hour = left_sec / 3600;
pascal@25365 26 @@ -605,7 +605,7 @@
pascal@25365 27 }
pascal@25365 28 }
pascal@25365 29
pascal@25365 30 - g_free(line);
pascal@25365 31 +
pascal@25365 32
pascal@25365 33 } else if (condition & G_IO_HUP) {
pascal@25365 34 if (g_object_get_data(G_OBJECT(mainWindow), "stopping") != NULL)
pascal@25365 35 diff -ur cpigeorig/gui/configlib.c cpige/gui/configlib.c
pascal@25365 36 --- cpigeorig/gui/configlib.c 2022-07-21 22:11:29.000000000 +0200
pascal@25365 37 +++ cpige/gui/configlib.c 2022-07-28 08:43:22.000000000 +0200
pascal@25365 38 @@ -68,7 +68,7 @@
pascal@25365 39 buf[i++] = c;
pascal@25365 40 }
pascal@25365 41 }
pascal@25365 42 - free(buf); /* Thx dunky */
pascal@25365 43 + /* Thx dunky */
pascal@25365 44 return config;
pascal@25365 45 }
pascal@25365 46
pascal@25365 47 @@ -145,8 +145,8 @@
pascal@25365 48 if (j == 0)
pascal@25365 49 {
pascal@25365 50 fprintf(stderr, "CONFIG ERROR: Incorrect Line. Should not start with '='\n");
pascal@25365 51 - free(confObj);
pascal@25365 52 - free(buf);
pascal@25365 53 +
pascal@25365 54 +
pascal@25365 55 return NULL;
pascal@25365 56 }
pascal@25365 57
pascal@25365 58 @@ -181,8 +181,6 @@
pascal@25365 59 if ((j == 0) || (confObj->var == NULL))
pascal@25365 60 {
pascal@25365 61 fprintf(stderr, "Invalid entry: variable defined, but without val.\n");
pascal@25365 62 - free(confObj);
pascal@25365 63 - free(buf);
pascal@25365 64 return NULL;
pascal@25365 65 }
pascal@25365 66
pascal@25365 67 @@ -202,7 +200,6 @@
pascal@25365 68
pascal@25365 69 confObj->val = strdup(buf);
pascal@25365 70
pascal@25365 71 - free(ptr);
pascal@25365 72
pascal@25365 73 return confObj;
pascal@25365 74 }
pascal@25365 75 @@ -310,17 +307,10 @@
pascal@25365 76 while (start != NULL)
pascal@25365 77 {
pascal@25365 78 if (start->conf != NULL)
pascal@25365 79 - {
pascal@25365 80 - if (start->conf->var != NULL)
pascal@25365 81 - free(start->conf->var);
pascal@25365 82 - if (start->conf->val != NULL)
pascal@25365 83 - free(start->conf->val);
pascal@25365 84
pascal@25365 85 - free(start->conf);
pascal@25365 86 - }
pascal@25365 87 old = start;
pascal@25365 88 start = start->next;
pascal@25365 89 - free(old);
pascal@25365 90 +
pascal@25365 91 }
pascal@25365 92 }
pascal@25365 93
pascal@25365 94 @@ -385,7 +375,7 @@
pascal@25365 95 }
pascal@25365 96 } else {
pascal@25365 97 *value = atoi(tmp);
pascal@25365 98 - free(tmp);
pascal@25365 99 +
pascal@25365 100 }
pascal@25365 101 }
pascal@25365 102
pascal@25365 103 @@ -407,6 +397,5 @@
pascal@25365 104 *value = atoi(tmp);
pascal@25365 105 if ( (*value) != 1)
pascal@25365 106 *value = 0;
pascal@25365 107 - free(tmp);
pascal@25365 108 }
pascal@25365 109 }
pascal@25365 110 diff -ur cpigeorig/gui/interface.c cpige/gui/interface.c
pascal@25365 111 --- cpigeorig/gui/interface.c 2022-07-21 22:11:29.000000000 +0200
pascal@25365 112 +++ cpige/gui/interface.c 2022-07-28 08:43:22.000000000 +0200
pascal@25365 113 @@ -118,7 +118,7 @@
pascal@25365 114
pascal@25365 115 mainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
pascal@25365 116 gtk_widget_set_name (mainWindow, "mainWindow");
pascal@25365 117 - gtk_window_set_title (GTK_WINDOW (mainWindow), gettext("cPige Configurator by Laurent Coustet"));
pascal@25365 118 + gtk_window_set_title (GTK_WINDOW (mainWindow), gettext("cPige Configurator by Laurent Coustet (SliTaz-Version)"));
pascal@25365 119 gtk_window_set_icon_name (GTK_WINDOW (mainWindow), "gtk-media-record");
pascal@25365 120
pascal@25365 121 vbox1 = gtk_vbox_new (FALSE, 0);
pascal@25365 122 @@ -131,7 +131,7 @@
pascal@25365 123 gtk_widget_show (menubar1);
pascal@25365 124 gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0);
pascal@25365 125
pascal@25365 126 - menuitem13 = gtk_menu_item_new_with_mnemonic ("_Fichier");
pascal@25365 127 + menuitem13 = gtk_menu_item_new_with_mnemonic ("_File");
pascal@25365 128 gtk_widget_set_name (menuitem13, "menuitem13");
pascal@25365 129 gtk_widget_show (menuitem13);
pascal@25365 130 gtk_container_add (GTK_CONTAINER (menubar1), menuitem13);
pascal@25365 131 @@ -356,7 +356,7 @@
pascal@25365 132 gtk_widget_show (label17);
pascal@25365 133 gtk_box_pack_start (GTK_BOX (hbox11), label17, FALSE, FALSE, 0);
pascal@25365 134
pascal@25365 135 - IntervalDelaySpinButton_adj = gtk_adjustment_new (10, 10, 30, 10, 10, 10);
pascal@25365 136 + IntervalDelaySpinButton_adj = gtk_adjustment_new (10, 10, 30, 10, 10, 0);
pascal@25365 137 IntervalDelaySpinButton = gtk_spin_button_new (GTK_ADJUSTMENT (IntervalDelaySpinButton_adj), 1, 0);
pascal@25365 138 gtk_widget_set_name (IntervalDelaySpinButton, "IntervalDelaySpinButton");
pascal@25365 139 gtk_widget_show (IntervalDelaySpinButton);
pascal@25365 140 @@ -377,7 +377,7 @@
pascal@25365 141 gtk_frame_set_label_widget (GTK_FRAME (PigeModeFrame), label16);
pascal@25365 142 gtk_label_set_use_markup (GTK_LABEL (label16), TRUE);
pascal@25365 143
pascal@25365 144 - MandatoryParametersLabel = gtk_label_new (gettext("<b>Mandatory parameters</b>"));
pascal@25365 145 + MandatoryParametersLabel = gtk_label_new (gettext("<b>URL Streaming</b>"));
pascal@25365 146 gtk_widget_set_name (MandatoryParametersLabel, "MandatoryParametersLabel");
pascal@25365 147 gtk_widget_show (MandatoryParametersLabel);
pascal@25365 148 gtk_frame_set_label_widget (GTK_FRAME (ParametersFrame), MandatoryParametersLabel);
pascal@25365 149 @@ -459,7 +459,7 @@
pascal@25365 150 gtk_tooltips_set_tip (tooltips, useNumbersButton, gettext("Should cPige prefix songs with a unique number ? (UNIX only, with pige mode Disabled)"), NULL);
pascal@25365 151 gtk_button_set_focus_on_click (GTK_BUTTON (useNumbersButton), FALSE);
pascal@25365 152
pascal@25365 153 - spinbutton2_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10);
pascal@25365 154 + spinbutton2_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 0);
pascal@25365 155 spinbutton2 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton2_adj), 1, 0);
pascal@25365 156 gtk_widget_set_name (spinbutton2, "skipSongsSpin");
pascal@25365 157 gtk_widget_show (spinbutton2);
pascal@25365 158 diff -ur cpigeorig/gui/main.c cpige/gui/main.c
pascal@25365 159 --- cpigeorig/gui/main.c 2022-07-21 22:11:29.000000000 +0200
pascal@25365 160 +++ cpige/gui/main.c 2022-07-28 08:43:22.000000000 +0200
pascal@25365 161 @@ -230,7 +230,7 @@
pascal@25365 162 if (retval == FALSE)
pascal@25365 163 return retval;
pascal@25365 164 } else {
pascal@25365 165 - free(val);
pascal@25365 166 +
pascal@25365 167 }
pascal@25365 168
pascal@25365 169 /* Setup savedirectory */
pascal@25365 170 @@ -398,7 +398,7 @@
pascal@25365 171 0
pascal@25365 172 );
pascal@25365 173
pascal@25365 174 - free(val);
pascal@25365 175 +
pascal@25365 176
pascal@25365 177 gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (gdouble)(intval));
pascal@25365 178
pascal@25365 179 @@ -449,7 +449,7 @@
pascal@25365 180 {
pascal@25365 181 gtk_tree_model_get(model, &iter, 0, &val, -1);
pascal@25365 182 conf_setValue(&conf, "url", val);
pascal@25365 183 - g_free(val);
pascal@25365 184 +
pascal@25365 185 } while ( gtk_tree_model_iter_next(model, &iter) == TRUE);
pascal@25365 186 }
pascal@25365 187
pascal@25365 188 @@ -458,7 +458,7 @@
pascal@25365 189 val = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
pascal@25365 190
pascal@25365 191 conf_setValue(&conf, "savedirectory", val);
pascal@25365 192 - g_free(val);
pascal@25365 193 +
pascal@25365 194
pascal@25365 195 /* Retreiving weekbackup */
pascal@25365 196 widget = lookup_widget(mainWindow, "WeekBackupButton");
pascal@25365 197 @@ -515,7 +515,7 @@
pascal@25365 198 val = (gchar *)g_malloc(8);
pascal@25365 199 snprintf(val, 8, "%d", intval);
pascal@25365 200 conf_setValue(&conf, "skipsongs", val);
pascal@25365 201 - g_free(val);
pascal@25365 202 +
pascal@25365 203
pascal@25365 204 /* Retreiving next title */
pascal@25365 205 widget = lookup_widget(mainWindow, "NextTitleEntry");
pascal@25365 206 @@ -536,7 +536,7 @@
pascal@25365 207 val = (gchar *)g_malloc(8);
pascal@25365 208 snprintf(val, 8, "%d", intval);
pascal@25365 209 conf_setValue(&conf, "cutdelay", val);
pascal@25365 210 - g_free(val);
pascal@25365 211 +
pascal@25365 212
pascal@25365 213 /* Retreiving logfile */
pascal@25365 214 widget = lookup_widget(mainWindow, "LogfileEntry");
pascal@25365 215 diff -ur cpigeorig/Makefile cpige/Makefile
pascal@25365 216 --- cpigeorig/Makefile 2022-07-21 22:11:29.000000000 +0200
pascal@25365 217 +++ cpige/Makefile 2022-07-28 08:43:22.000000000 +0200
pascal@25365 218 @@ -16,6 +16,6 @@
pascal@25365 219 docker run --rm -it -v $(shell pwd):$(shell pwd) -w $(shell pwd) alpine:latest ./build_alpine.sh
pascal@25365 220
pascal@25365 221 cpige: $(OBJS)
pascal@25365 222 - $(CC) $(CFLAGS) $(CLIBS) $(OBJS) -static -o cpige
pascal@25365 223 + $(CC) $(CFLAGS) $(CLIBS) $(OBJS) -o cpige
pascal@25365 224
pascal@25365 225