Skip to content
Snippets Groups Projects

Remove recomendation to use non-free software

Merged Remove recomendation to use non-free software
aklis/package-helpers:compiz-fglrx into belenos
Merged Santiago Rodriguez requested to merge aklis/package-helpers:compiz-fglrx into belenos

Merge request reports

Merged by avatar (Mar 29, 2025 3:35am UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
helpers/make-compiz 0 → 100644
37 count=0
38
39 while [ "$count" -lt "$xmlSkipLines" ] ; do
40 count=`expr $count + 1`;
41 read line
42 echo "$line"
43 done
44
45 echo "-->"
46 else
47 echo "$line"
48 fi
49
50 done > $xmlFileName.tmp
51 mv $xmlFileName.tmp $xmlFileName
52
  • Ruben Rodriguez
    Ruben Rodriguez @ruben started a thread on the diff
    • helpers/make-compiz 0 → 100644
    73 count=0
    74
    75 while [ "$count" -lt "$cppSkipLines" ] ; do
    76 count=`expr $count + 1`;
    77 read line
    78 echo "$line"
    79 done
    80
    81 echo "****************/"
    82 else
    83 echo "$line"
    84 fi
    85
    86 done > $cppFileName.tmp
    87 mv $cppFileName.tmp $cppFileName
    88
    • Ruben Rodriguez
      Ruben Rodriguez @ruben ·
      Owner

      The previous section can be replaced with

      sed -i '/optionSetFglrxXglFixNotify/,/_1/ s:^://:' plugins/workarounds/src/workarounds.cpp
  • Santiago Rodriguez Added 1 commit:

    Added 1 commit:

    • 32a9a4d6 - compiz: change string manipulations and use sed
  • G
    Ghost User @ghost ·

    Build triggered.

  • G
    Ghost User @ghost ·

    Build finished. Result OK Build results available at: http://jenkins.trisquel.info:8085/job/request-merge-source-builder/166/

  • Santiago Rodriguez
    Santiago Rodriguez @aklis ·
    Author Owner

    Keep in mind that this is a 3 year old patch for FSDG bug forgotten in the mailing list & bugtracker.

    I only did minor changes to fix the build, as I didn't want to nickpick the original author.

  • Ruben Rodriguez mentioned in commit a8eb5069

    mentioned in commit a8eb5069

  • Ruben Rodriguez Status changed to merged

    Status changed to merged

    • Please register or sign in to reply